fix: missing hovered state for quickpanel

as title. Issue: linuxdeepin/developer-center#9799
linuxdeepin · Aug 30, 2024 · 40f62f8 · 40f62f8
1 parent 638c6f4
commit 40f62f8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/panels/dock/tray/ShellSurfaceItemProxy.qml b/panels/dock/tray/ShellSurfaceItemProxy.qml
@@ -13,6 +13,8 @@ Item {
     signal surfaceDestroyed()
     property bool autoClose: false
     property bool inputEventsEnabled: true
+    property bool hovered: hoverHandler.hovered
+    property bool pressed: tapHandler.pressed
 
     width: impl.width
     height: impl.height
@@ -23,6 +25,14 @@ Item {
         id: impl
         shellSurface: root.shellSurface
         inputEventsEnabled: root.inputEventsEnabled
+
+        HoverHandler {
+            id: hoverHandler
+        }
+        TapHandler {
+            id: tapHandler
+        }
+
         onVisibleChanged: function () {
             if (autoClose && !visible) {
                 // surface is valid but client's shellSurface maybe invalid.

diff --git a/panels/dock/tray/quickpanel/PanelTrayItem.qml b/panels/dock/tray/quickpanel/PanelTrayItem.qml
@@ -81,12 +81,7 @@ Control {
         implicitWidth: surfaceLayer.width
         implicitHeight: surfaceLayer.height
         property alias shellSurface: surfaceLayer.shellSurface
-        property alias hovered: hoverHandler.hovered
-
-        HoverHandler {
-            id: hoverHandler
-            parent: surfaceLayer
-        }
+        property alias hovered: surfaceLayer.hovered
 
         ShellSurfaceItemProxy {
             id: surfaceLayer

diff --git a/panels/dock/tray/quickpanel/PluginItem.qml b/panels/dock/tray/quickpanel/PluginItem.qml
@@ -44,15 +44,6 @@ Control {
         }
     }
 
-    HoverHandler {
-        id: hoverHandler
-        parent: surfaceLayer
-    }
-    TapHandler {
-        id: tapHandler
-        parent: surfaceLayer
-    }
-
     ShellSurfaceItemProxy {
         id: surfaceLayer
         anchors.centerIn: parent
@@ -80,8 +71,8 @@ Control {
         id: backgroundControl
 
         // Control's hovered is false when hover ShellSurfaceItem.
-        ColorSelector.hovered: hoverHandler.hovered
-        ColorSelector.pressed: tapHandler.pressed
+        ColorSelector.hovered: surfaceLayer.hovered
+        ColorSelector.pressed: surfaceLayer.pressed
         property Palette backgroundColor: Palette {
             normal {
                 common: ("transparent")