...

3 files changed, 21 insertions, 21 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell/Bar.qml b/accounts/gkleen@sif/shell/quickshell/Bar.qml
index 399b566f..d52740b2 100644
--- a/accounts/gkleen@sif/shell/quickshell/Bar.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Bar.qml
@@ -89,18 +89,8 @@ PanelWindow {
 
     PipewireWidget {}
 
-    Item {
-      height: parent.height
-      width: 2
-    }
-
     SystemTray {}
 
-    Item {
-      height: parent.height
-      width: 2
-    }
-
     KeyboardLayout {}
 
     Item {
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/Brightness.qml b/accounts/gkleen@sif/shell/quickshell/Services/Brightness.qml
index 545ef24f..87c7c05b 100644
--- a/accounts/gkleen@sif/shell/quickshell/Services/Brightness.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Services/Brightness.qml
@@ -26,11 +26,11 @@ Singleton {
   Component.onCompleted: root.currBrightness = root.calcCurrBrightness()
   Connections {
     target: currFile
-    onLoaded: root.currBrightness = root.calcCurrBrightness()
+    function onLoaded() { root.currBrightness = root.calcCurrBrightness(); }
   }
   Connections {
     target: maxFile
-    onLoaded: root.currBrightness = root.calcCurrBrightness()
+    function onLoaded() { root.currBrightness = root.calcCurrBrightness(); }
   }
 
   onCurrBrightnessChanged: {
diff --git a/accounts/gkleen@sif/shell/quickshell/SystemTray.qml b/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
index 956f3995..6f70be29 100644
--- a/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
+++ b/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
@@ -47,7 +47,7 @@ Item {
           return ""
         }
 
-        width: 16
+        width: icon.width + 6
         height: parent.height
         anchors.verticalCenter: parent.verticalCenter
 
@@ -83,14 +83,24 @@ Item {
             }
           }
 
-          IconImage {
-            anchors.centerIn: parent
-            width: parent.width
-            height: parent.width
-            source: trayItemWrapper.iconSource
-            asynchronous: true
-            smooth: true
-            mipmap: true
+          Rectangle {
+            anchors.fill: parent
+            color: {
+              if (trayItemArea.containsMouse)
+                return "#33808080";
+              return "transparent";
+            }
+
+            IconImage {
+              id: icon
+
+              anchors.centerIn: parent
+              implicitSize: 16
+              source: trayItemWrapper.iconSource
+              asynchronous: true
+              smooth: true
+              mipmap: true
+            }
           }
         }