fix some topbar issues

Modules/TopBar/LauncherButton.qml

@@ -3,50 +3,28 @@ import qs.Common
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+Item {
   id: root
 
   property bool isActive: false
-  property string section: "left" // Which section this button is in
-  property var popupTarget: null // Reference to the popup to position
-  property var parentScreen: null // The screen this button is on
+  property string section: "left"
+  property var popupTarget: null
+  property var parentScreen: null
 
   signal clicked
 
   width: 40
   height: 30
-  radius: Theme.cornerRadius
-  color: {
-    const baseColor = launcherArea.containsMouse
-                    || isActive ? Theme.surfaceTextPressed : Theme.surfaceTextHover
-    return Qt.rgba(baseColor.r, baseColor.g, baseColor.b,
-                   baseColor.a * Theme.widgetTransparency)
-  }
-
-  SystemLogo {
-    visible: SettingsData.useOSLogo
-    anchors.centerIn: parent
-    width: Theme.iconSize - 3
-    height: Theme.iconSize - 3
-    colorOverride: SettingsData.osLogoColorOverride
-    brightnessOverride: SettingsData.osLogoBrightness
-    contrastOverride: SettingsData.osLogoContrast
-  }
-
-  DankIcon {
-    visible: !SettingsData.useOSLogo
-    anchors.centerIn: parent
-    name: "apps"
-    size: Theme.iconSize - 6
-    color: Theme.surfaceText
-  }
 
   MouseArea {
     id: launcherArea
-
     anchors.fill: parent
     hoverEnabled: true
     cursorShape: Qt.PointingHandCursor
+    z: 1000
+    preventStealing: true
+    propagateComposedEvents: false
+    
     onClicked: {
       if (popupTarget && popupTarget.setTriggerPosition) {
         var globalPos = mapToGlobal(0, 0)
@@ -61,10 +39,39 @@ Rectangle {
     }
   }
 
-  Behavior on color {
-    ColorAnimation {
-      duration: Theme.shortDuration
-      easing.type: Theme.standardEasing
+  Rectangle {
+    anchors.fill: parent
+    radius: Theme.cornerRadius
+    color: {
+      const baseColor = launcherArea.containsMouse
+                      || isActive ? Theme.surfaceTextPressed : Theme.surfaceTextHover
+      return Qt.rgba(baseColor.r, baseColor.g, baseColor.b,
+                     baseColor.a * Theme.widgetTransparency)
+    }
+
+    SystemLogo {
+      visible: SettingsData.useOSLogo
+      anchors.centerIn: parent
+      width: Theme.iconSize - 3
+      height: Theme.iconSize - 3
+      colorOverride: SettingsData.osLogoColorOverride
+      brightnessOverride: SettingsData.osLogoBrightness
+      contrastOverride: SettingsData.osLogoContrast
+    }
+
+    DankIcon {
+      visible: !SettingsData.useOSLogo
+      anchors.centerIn: parent
+      name: "apps"
+      size: Theme.iconSize - 6
+      color: Theme.surfaceText
+    }
+
+    Behavior on color {
+      ColorAnimation {
+        duration: Theme.shortDuration
+        easing.type: Theme.standardEasing
+      }
     }
   }
-}
+}