icons: some fixes for previous axes change

Mostly spacing fixes
Also qsTr windowinfo class and title when none

7 files changed, 18 insertions, 10 deletions

diff --git a/modules/bar/components/StatusIcons.qml b/modules/bar/components/StatusIcons.qml
index c260cc6..540f041 100644
--- a/modules/bar/components/StatusIcons.qml
+++ b/modules/bar/components/StatusIcons.qml
@@ -35,7 +35,7 @@ Item {
 
         anchors.horizontalCenter: network.horizontalCenter
         anchors.top: network.bottom
-        anchors.topMargin: Appearance.spacing.small
+        anchors.topMargin: Appearance.spacing.smaller / 2
 
         animate: true
         text: Bluetooth.powered ? "bluetooth" : "bluetooth_disabled"
@@ -47,7 +47,9 @@ Item {
 
         anchors.horizontalCenter: bluetooth.horizontalCenter
         anchors.top: bluetooth.bottom
-        anchors.topMargin: Appearance.spacing.small
+        anchors.topMargin: Appearance.spacing.smaller / 2
+
+        spacing: Appearance.spacing.smaller / 2
 
         Repeater {
             id: repeater
@@ -72,7 +74,7 @@ Item {
 
         anchors.horizontalCenter: devices.horizontalCenter
         anchors.top: repeater.count > 0 ? devices.bottom : bluetooth.bottom
-        anchors.topMargin: Appearance.spacing.small
+        anchors.topMargin: Appearance.spacing.smaller / 2
 
         animate: true
         text: {
diff --git a/modules/bar/components/workspaces/Workspace.qml b/modules/bar/components/workspaces/Workspace.qml
index e50f65c..dba0f86 100644
--- a/modules/bar/components/workspaces/Workspace.qml
+++ b/modules/bar/components/workspaces/Workspace.qml
@@ -15,7 +15,7 @@ Item {
 
     readonly property bool isWorkspace: true // Flag for finding workspace children
     // 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 bool isOccupied: occupied[ws] ?? false
@@ -49,9 +49,10 @@ Item {
 
         anchors.horizontalCenter: indicator.horizontalCenter
         anchors.top: indicator.bottom
+        anchors.topMargin: -Config.bar.sizes.innerHeight / 10
 
         sourceComponent: Column {
-            spacing: Appearance.spacing.small
+            spacing: 0
 
             add: Transition {
                 Anim {
@@ -81,6 +82,7 @@ Item {
                 MaterialIcon {
                     required property Hyprland.Client modelData
 
+                    grade: 0
                     text: Icons.getAppCategoryIcon(modelData.wmClass, "terminal")
                     color: Colours.palette.m3onSurfaceVariant
                 }
diff --git a/modules/launcher/ActionItem.qml b/modules/launcher/ActionItem.qml
index db3242a..01dcf1b 100644
--- a/modules/launcher/ActionItem.qml
+++ b/modules/launcher/ActionItem.qml
@@ -39,7 +39,7 @@ Item {
 
         Item {
             anchors.left: icon.right
-            anchors.leftMargin: Appearance.spacing.larger
+            anchors.leftMargin: Appearance.spacing.normal
             anchors.verticalCenter: icon.verticalCenter
 
             implicitWidth: parent.width - icon.width
diff --git a/modules/lock/Buttons.qml b/modules/lock/Buttons.qml
index 0d2ce54..51613b5 100644
--- a/modules/lock/Buttons.qml
+++ b/modules/lock/Buttons.qml
@@ -1,3 +1,5 @@
+pragma ComponentBehavior: Bound
+
 import "root:/widgets"
 import "root:/services"
 import "root:/config"
@@ -99,6 +101,7 @@ WrapperItem {
             text: parent.icon
             color: Colours.palette.m3onSecondaryContainer
             font.pointSize: (parent.width * 0.4) || 1
+            font.weight: handler.hovered ? 500 : 400
         }
 
         Behavior on radius {
diff --git a/modules/session/Content.qml b/modules/session/Content.qml
index fb8e3c6..63a184f 100644
--- a/modules/session/Content.qml
+++ b/modules/session/Content.qml
@@ -113,6 +113,7 @@ Column {
             text: button.icon
             color: button.activeFocus ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface
             font.pointSize: Appearance.font.size.extraLarge
+            font.weight: 500
         }
     }
 }
diff --git a/modules/windowinfo/Details.qml b/modules/windowinfo/Details.qml
index 7b9f9b8..da25f61 100644
--- a/modules/windowinfo/Details.qml
+++ b/modules/windowinfo/Details.qml
@@ -14,7 +14,7 @@ ColumnLayout {
     Label {
         Layout.topMargin: Appearance.padding.large * 2
 
-        text: Hyprland.activeClient?.title ?? "No active client"
+        text: Hyprland.activeClient?.title ?? qsTr("No active client")
         wrapMode: Text.WrapAtWordBoundaryOrAnywhere
 
         font.pointSize: Appearance.font.size.large
@@ -22,7 +22,7 @@ ColumnLayout {
     }
 
     Label {
-        text: Hyprland.activeClient?.wmClass ?? "No active client"
+        text: Hyprland.activeClient?.wmClass ?? qsTr("No active client")
         color: Colours.palette.m3tertiary
 
         font.pointSize: Appearance.font.size.larger
@@ -132,7 +132,7 @@ ColumnLayout {
         Layout.rightMargin: Appearance.padding.large
         Layout.fillWidth: true
 
-        spacing: Appearance.spacing.normal
+        spacing: Appearance.spacing.smaller
 
         MaterialIcon {
             id: icon
diff --git a/widgets/VerticalSlider.qml b/widgets/VerticalSlider.qml
index 2b807a1..fc20bef 100644
--- a/widgets/VerticalSlider.qml
+++ b/widgets/VerticalSlider.qml
@@ -68,7 +68,7 @@ Slider {
                 function update(): void {
                     animate = !moving;
                     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;
                 }