1 files changed, 35 insertions, 17 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell/SystemTray.qml b/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
index ba678138..6f70be29 100644
--- a/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
+++ b/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
@@ -17,13 +17,17 @@ Item {
     spacing: 0
 
     Repeater {
-      model: {
-        var trayItems = Array.from(SystemTray.items.values).filter(item => item.status !== Status.Passive);
-        trayItems.sort((a, b) => a.category !== b.category ? b.category - a.category : a.id.localeCompare(b.id))
-        return trayItems;
+      model: ScriptModel {
+        values: {
+          var trayItems = Array.from(SystemTray.items.values).filter(item => item.status !== Status.Passive);
+          trayItems.sort((a, b) => a.category !== b.category ? b.category - a.category : a.id.localeCompare(b.id))
+          return trayItems;
+        }
       }
 
       delegate: Item {
+        id: trayItemWrapper
+
         property var trayItem: modelData
         property string iconSource: {
           let icon = trayItem && trayItem.icon
@@ -43,21 +47,11 @@ Item {
           return ""
         }
 
-        width: 16
+        width: icon.width + 6
         height: parent.height
         anchors.verticalCenter: parent.verticalCenter
 
-        IconImage {
-          anchors.centerIn: parent
-          width: parent.width
-          height: parent.width
-          source: parent.iconSource
-          asynchronous: true
-          smooth: true
-          mipmap: true
-        }
-
-        MouseArea {
+        WrapperMouseArea {
           id: trayItemArea
 
           anchors.fill: parent
@@ -88,6 +82,26 @@ Item {
               menuAnchor.open()
             }
           }
+
+          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
+            }
+          }
         }
 
         PopupWindow {
@@ -112,7 +126,7 @@ Item {
           color: "black"
 
           implicitWidth: Math.max(tooltipTitle.contentWidth, tooltipDescription.contentWidth) + 16
-          implicitHeight: tooltipTitle.contentHeight + tooltipDescription.contentHeight + 16
+          implicitHeight: (trayItem.tooltipTitle ? tooltipTitle.contentHeight : 0) + (trayItem.tooltipDescription ? tooltipDescription.contentHeight : 0) + 16
 
           WrapperMouseArea {
             id: tooltipMouseArea
@@ -126,6 +140,8 @@ Item {
               Text {
                 id: tooltipTitle
 
+                enabled: trayItem.tooltipTitle
+
                 font.pointSize: 10
                 font.family: "Fira Sans"
                 font.bold: true
@@ -137,6 +153,8 @@ Item {
               Text {
                 id: tooltipDescription
 
+                enabled: trayItem.tooltipDescription
+
                 font.pointSize: 10
                 font.family: "Fira Sans"
                 color: "white"