icons: some fixes for previous axes change
Mostly spacing fixes Also qsTr windowinfo class and title when none
This commit is contained in:
parent
7ddf40d2ea
commit
11c8e5c7eb
7 changed files with 18 additions and 10 deletions
|
|
@ -35,7 +35,7 @@ Item {
|
||||||
|
|
||||||
anchors.horizontalCenter: network.horizontalCenter
|
anchors.horizontalCenter: network.horizontalCenter
|
||||||
anchors.top: network.bottom
|
anchors.top: network.bottom
|
||||||
anchors.topMargin: Appearance.spacing.small
|
anchors.topMargin: Appearance.spacing.smaller / 2
|
||||||
|
|
||||||
animate: true
|
animate: true
|
||||||
text: Bluetooth.powered ? "bluetooth" : "bluetooth_disabled"
|
text: Bluetooth.powered ? "bluetooth" : "bluetooth_disabled"
|
||||||
|
|
@ -47,7 +47,9 @@ Item {
|
||||||
|
|
||||||
anchors.horizontalCenter: bluetooth.horizontalCenter
|
anchors.horizontalCenter: bluetooth.horizontalCenter
|
||||||
anchors.top: bluetooth.bottom
|
anchors.top: bluetooth.bottom
|
||||||
anchors.topMargin: Appearance.spacing.small
|
anchors.topMargin: Appearance.spacing.smaller / 2
|
||||||
|
|
||||||
|
spacing: Appearance.spacing.smaller / 2
|
||||||
|
|
||||||
Repeater {
|
Repeater {
|
||||||
id: repeater
|
id: repeater
|
||||||
|
|
@ -72,7 +74,7 @@ Item {
|
||||||
|
|
||||||
anchors.horizontalCenter: devices.horizontalCenter
|
anchors.horizontalCenter: devices.horizontalCenter
|
||||||
anchors.top: repeater.count > 0 ? devices.bottom : bluetooth.bottom
|
anchors.top: repeater.count > 0 ? devices.bottom : bluetooth.bottom
|
||||||
anchors.topMargin: Appearance.spacing.small
|
anchors.topMargin: Appearance.spacing.smaller / 2
|
||||||
|
|
||||||
animate: true
|
animate: true
|
||||||
text: {
|
text: {
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ Item {
|
||||||
|
|
||||||
readonly property bool isWorkspace: true // Flag for finding workspace children
|
readonly property bool isWorkspace: true // Flag for finding workspace children
|
||||||
// Unanimated prop for others to use as reference
|
// Unanimated prop for others to use as reference
|
||||||
readonly property real size: childrenRect.height + (hasWindows ? Appearance.padding.normal : 0)
|
readonly property real size: childrenRect.height + (hasWindows ? Appearance.padding.smaller : 0)
|
||||||
|
|
||||||
readonly property int ws: groupOffset + index + 1
|
readonly property int ws: groupOffset + index + 1
|
||||||
readonly property bool isOccupied: occupied[ws] ?? false
|
readonly property bool isOccupied: occupied[ws] ?? false
|
||||||
|
|
@ -49,9 +49,10 @@ Item {
|
||||||
|
|
||||||
anchors.horizontalCenter: indicator.horizontalCenter
|
anchors.horizontalCenter: indicator.horizontalCenter
|
||||||
anchors.top: indicator.bottom
|
anchors.top: indicator.bottom
|
||||||
|
anchors.topMargin: -Config.bar.sizes.innerHeight / 10
|
||||||
|
|
||||||
sourceComponent: Column {
|
sourceComponent: Column {
|
||||||
spacing: Appearance.spacing.small
|
spacing: 0
|
||||||
|
|
||||||
add: Transition {
|
add: Transition {
|
||||||
Anim {
|
Anim {
|
||||||
|
|
@ -81,6 +82,7 @@ Item {
|
||||||
MaterialIcon {
|
MaterialIcon {
|
||||||
required property Hyprland.Client modelData
|
required property Hyprland.Client modelData
|
||||||
|
|
||||||
|
grade: 0
|
||||||
text: Icons.getAppCategoryIcon(modelData.wmClass, "terminal")
|
text: Icons.getAppCategoryIcon(modelData.wmClass, "terminal")
|
||||||
color: Colours.palette.m3onSurfaceVariant
|
color: Colours.palette.m3onSurfaceVariant
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ Item {
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
anchors.left: icon.right
|
anchors.left: icon.right
|
||||||
anchors.leftMargin: Appearance.spacing.larger
|
anchors.leftMargin: Appearance.spacing.normal
|
||||||
anchors.verticalCenter: icon.verticalCenter
|
anchors.verticalCenter: icon.verticalCenter
|
||||||
|
|
||||||
implicitWidth: parent.width - icon.width
|
implicitWidth: parent.width - icon.width
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
pragma ComponentBehavior: Bound
|
||||||
|
|
||||||
import "root:/widgets"
|
import "root:/widgets"
|
||||||
import "root:/services"
|
import "root:/services"
|
||||||
import "root:/config"
|
import "root:/config"
|
||||||
|
|
@ -99,6 +101,7 @@ WrapperItem {
|
||||||
text: parent.icon
|
text: parent.icon
|
||||||
color: Colours.palette.m3onSecondaryContainer
|
color: Colours.palette.m3onSecondaryContainer
|
||||||
font.pointSize: (parent.width * 0.4) || 1
|
font.pointSize: (parent.width * 0.4) || 1
|
||||||
|
font.weight: handler.hovered ? 500 : 400
|
||||||
}
|
}
|
||||||
|
|
||||||
Behavior on radius {
|
Behavior on radius {
|
||||||
|
|
|
||||||
|
|
@ -113,6 +113,7 @@ Column {
|
||||||
text: button.icon
|
text: button.icon
|
||||||
color: button.activeFocus ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface
|
color: button.activeFocus ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface
|
||||||
font.pointSize: Appearance.font.size.extraLarge
|
font.pointSize: Appearance.font.size.extraLarge
|
||||||
|
font.weight: 500
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ ColumnLayout {
|
||||||
Label {
|
Label {
|
||||||
Layout.topMargin: Appearance.padding.large * 2
|
Layout.topMargin: Appearance.padding.large * 2
|
||||||
|
|
||||||
text: Hyprland.activeClient?.title ?? "No active client"
|
text: Hyprland.activeClient?.title ?? qsTr("No active client")
|
||||||
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
|
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
|
||||||
|
|
||||||
font.pointSize: Appearance.font.size.large
|
font.pointSize: Appearance.font.size.large
|
||||||
|
|
@ -22,7 +22,7 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
|
|
||||||
Label {
|
Label {
|
||||||
text: Hyprland.activeClient?.wmClass ?? "No active client"
|
text: Hyprland.activeClient?.wmClass ?? qsTr("No active client")
|
||||||
color: Colours.palette.m3tertiary
|
color: Colours.palette.m3tertiary
|
||||||
|
|
||||||
font.pointSize: Appearance.font.size.larger
|
font.pointSize: Appearance.font.size.larger
|
||||||
|
|
@ -132,7 +132,7 @@ ColumnLayout {
|
||||||
Layout.rightMargin: Appearance.padding.large
|
Layout.rightMargin: Appearance.padding.large
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
||||||
spacing: Appearance.spacing.normal
|
spacing: Appearance.spacing.smaller
|
||||||
|
|
||||||
MaterialIcon {
|
MaterialIcon {
|
||||||
id: icon
|
id: icon
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ Slider {
|
||||||
function update(): void {
|
function update(): void {
|
||||||
animate = !moving;
|
animate = !moving;
|
||||||
text = moving ? Qt.binding(() => Math.round(root.value * 100)) : Qt.binding(() => root.icon);
|
text = moving ? Qt.binding(() => Math.round(root.value * 100)) : Qt.binding(() => root.icon);
|
||||||
font.pointSize = moving ? Appearance.font.size.small : Appearance.font.size.normal;
|
font.pointSize = moving ? Appearance.font.size.small : Appearance.font.size.larger;
|
||||||
font.family = moving ? Appearance.font.family.sans : Appearance.font.family.material;
|
font.family = moving ? Appearance.font.family.sans : Appearance.font.family.material;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue