...

3 files changed, 15 insertions, 11 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell/Bar.qml b/accounts/gkleen@sif/shell/quickshell/Bar.qml
index 6952c658..f8092604 100644
--- a/accounts/gkleen@sif/shell/quickshell/Bar.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Bar.qml
@@ -5,7 +5,6 @@ PanelWindow {
   id: bar
 
   required property var screen
-  required property var inhibitorState
 
   anchors {
     top: true
@@ -64,32 +63,38 @@ PanelWindow {
     anchors.verticalCenter: parent.verticalCenter
     spacing: 0
 
+    KeyboardLayout {}
+
+    Item {
+      visible: privacy.visible
+      height: parent.height
+      width: 8 - 4
+    }
+
     PrivacyWidget {
       id: privacy
     }
 
     Item {
-      enabled: privacy.active
+      visible: privacy.visible
       height: parent.height
       width: 8 - 4
     }
 
-    BatteryWidget {}
-
-    BrightnessWidget {}
+    SystemTray {}
 
     PipewireWidget {}
 
-    SystemTray {}
-
-    KeyboardLayout {}
+    BrightnessWidget {}
 
-    LidSwitchInhibitorWidget {}
+    BatteryWidget {}
 
     WaylandInhibitorWidget {
       window: bar
     }
 
+    LidSwitchInhibitorWidget {}
+
     Item {
       height: parent.height
       width: 8 - 4
diff --git a/accounts/gkleen@sif/shell/quickshell/PrivacyWidget.qml b/accounts/gkleen@sif/shell/quickshell/PrivacyWidget.qml
index bb02528b..d7ffadfe 100644
--- a/accounts/gkleen@sif/shell/quickshell/PrivacyWidget.qml
+++ b/accounts/gkleen@sif/shell/quickshell/PrivacyWidget.qml
@@ -9,7 +9,7 @@ Item {
   width: layout.childrenRect.width
   anchors.verticalCenter: parent.verticalCenter
 
-  readonly property bool active: Boolean(Privacy.activeItems)
+  visible: Array.from(Privacy.activeItems).length > 0
 
   RowLayout {
     id: layout
diff --git a/accounts/gkleen@sif/shell/quickshell/shell.qml b/accounts/gkleen@sif/shell/quickshell/shell.qml
index ccb4e82e..693d741f 100644
--- a/accounts/gkleen@sif/shell/quickshell/shell.qml
+++ b/accounts/gkleen@sif/shell/quickshell/shell.qml
@@ -36,7 +36,6 @@ ShellRoot {
 
       Bar {
         screen: screenScope.modelData
-        inhibitorState: inhibitorState
       }
     }
   }