bar: optional active ws indicator

3 files changed, 16 insertions, 12 deletions

diff --git a/modules/bar/components/workspaces/ActiveIndicator.qml b/modules/bar/components/workspaces/ActiveIndicator.qml
index 0d1768f..54f10fa 100644
--- a/modules/bar/components/workspaces/ActiveIndicator.qml
+++ b/modules/bar/components/workspaces/ActiveIndicator.qml
@@ -28,9 +28,6 @@ Rectangle {
     height: (vertical ? size : BarConfig.sizes.innerHeight) - 2
     radius: BarConfig.workspaces.rounded ? Appearance.rounding.full : 0
 
-    anchors.horizontalCenter: vertical ? parent.horizontalCenter : undefined
-    anchors.verticalCenter: vertical ? undefined : parent.verticalCenter
-
     Rectangle {
         id: base
 
diff --git a/modules/bar/components/workspaces/Workspace.qml b/modules/bar/components/workspaces/Workspace.qml
index 97c99b0..9edc8e4 100644
--- a/modules/bar/components/workspaces/Workspace.qml
+++ b/modules/bar/components/workspaces/Workspace.qml
@@ -34,7 +34,7 @@ Item {
 
         animate: true
         text: Hyprland.activeWsId === root.ws ? activeLabel : root.isOccupied ? occupiedLabel : label
-        color: BarConfig.workspaces.occupiedBg || root.isOccupied ? Appearance.colours.m3onSurface : Appearance.colours.m3outlineVariant
+        color: BarConfig.workspaces.occupiedBg || root.isOccupied || Hyprland.activeWsId === root.ws ? Appearance.colours.m3onSurface : Appearance.colours.m3outlineVariant
         horizontalAlignment: StyledText.AlignHCenter
         verticalAlignment: StyledText.AlignVCenter
 
diff --git a/modules/bar/components/workspaces/Workspaces.qml b/modules/bar/components/workspaces/Workspaces.qml
index e4ff787..1920ffc 100644
--- a/modules/bar/components/workspaces/Workspaces.qml
+++ b/modules/bar/components/workspaces/Workspaces.qml
@@ -1,3 +1,5 @@
+pragma ComponentBehavior: Bound
+
 import "root:/widgets"
 import "root:/services"
 import "root:/config"
@@ -50,14 +52,19 @@ Item {
         }
     }
 
-    ActiveIndicator {
-        color: root.colour
-        vertical: root.vertical
-        workspaces: root.workspaces
-        mask: layout
-        maskWidth: root.width
-        maskHeight: root.height
-        groupOffset: root.groupOffset
+    Loader {
+        active: BarConfig.workspaces.activeIndicator
+        asynchronous: true
+
+        sourceComponent: ActiveIndicator {
+            color: root.colour
+            vertical: root.vertical
+            workspaces: root.workspaces
+            mask: layout
+            maskWidth: root.width
+            maskHeight: root.height
+            groupOffset: root.groupOffset
+        }
     }
 
     MouseArea {