1 files changed, 24 insertions, 10 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell/SystemTray.qml b/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
index 55b1690e..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
+            }
           }
         }
 
@@ -116,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
@@ -130,6 +140,8 @@ Item {
               Text {
                 id: tooltipTitle
 
+                enabled: trayItem.tooltipTitle
+
                 font.pointSize: 10
                 font.family: "Fira Sans"
                 font.bold: true
@@ -141,6 +153,8 @@ Item {
               Text {
                 id: tooltipDescription
 
+                enabled: trayItem.tooltipDescription
+
                 font.pointSize: 10
                 font.family: "Fira Sans"
                 color: "white"