bar: fix alignment

Also refactor box -> styledrect + paddedrect

2 files changed, 10 insertions, 20 deletions

diff --git a/modules/bar/components/ActiveWindow.qml b/modules/bar/components/ActiveWindow.qml
index 24edb9e..40f7a64 100644
--- a/modules/bar/components/ActiveWindow.qml
+++ b/modules/bar/components/ActiveWindow.qml
@@ -5,12 +5,11 @@ import "root:/config"
 import QtQuick
 import QtQuick.Layouts
 
-Box {
+StyledRect {
     id: root
 
     readonly property color colour: Appearance.colours.pink
 
-    padding: [Appearance.padding.smaller, 0]
     animated: true
     clip: true
 
@@ -21,14 +20,14 @@ Box {
         color: root.colour
     }
 
-    StyledText {
+    AnchorText {
+        prevAnchor: icon
+        vertical: root.vertical
+
         text: Hyprland.activeClient?.title ?? "Desktop"
         font.pointSize: Appearance.font.size.smaller
         font.family: Appearance.font.family.mono
         color: root.colour
         rotation: root.vertical ? 90 : 0
-
-        anchors.left: icon.right
-        anchors.leftMargin: Appearance.padding.smaller
     }
 }
diff --git a/modules/bar/components/OsIcon.qml b/modules/bar/components/OsIcon.qml
index 5f2a103..0daa945 100644
--- a/modules/bar/components/OsIcon.qml
+++ b/modules/bar/components/OsIcon.qml
@@ -1,19 +1,10 @@
 import "root:/widgets"
-import "root:/services"
 import "root:/utils"
 import "root:/config"
-import QtQuick
-import QtQuick.Layouts
 
-Box {
-    padding: [Appearance.padding.smaller, 0]
-
-    StyledText {
-        text: Icons.osIcon
-        font.pointSize: Appearance.font.size.smaller
-        font.family: Appearance.font.family.mono
-        color: Appearance.colours.yellow
-
-        Layout.alignment: Layout.Center
-    }
+StyledText {
+    text: Icons.osIcon
+    font.pointSize: Appearance.font.size.smaller
+    font.family: Appearance.font.family.mono
+    color: Appearance.colours.yellow
 }