fix: application tray and collapse tray dose not have tooltip

add tooltip Issue: linuxdeepin/developer-center#10031
linuxdeepin · Jul 31, 2024 · 1902367 · 1902367
1 parent 6fcc5d0
commit 1902367
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 4 deletions.
diff --git a/panels/dock/tray/package/ActionShowStashDelegate.qml b/panels/dock/tray/package/ActionShowStashDelegate.qml
@@ -39,10 +39,6 @@ AppletItemButton {
         return Qt.point(x + width / 2, y + height / 2)
     }
 
-    HoverHandler {
-        id: hoverHandler
-    }
-
     onItemGlobalPointChanged: {
         stashedPopup.collapsedBtnCenterPoint = itemGlobalPoint
     }
@@ -91,5 +87,36 @@ AppletItemButton {
 
     onClicked: {
         stashedPopup.open()
+        toolTip.close()
+    }
+
+    PanelToolTip {
+        id: toolTip
+        text: qsTr("Application tray")
+        toolTipX: DockPanelPositioner.x
+        toolTipY: DockPanelPositioner.y
+    }
+    Timer {
+        id: toolTipShowTimer
+        interval: 200
+        onTriggered: {
+            var point = root.mapToItem(null, root.width / 2, root.height / 2)
+            toolTip.DockPanelPositioner.bounding = Qt.rect(point.x, point.y, toolTip.width, toolTip.height)
+            toolTip.open()
+        }
+    }
+    HoverHandler {
+        id: hoverHandler
+        onHoveredChanged: {
+            if (hovered) {
+                toolTipShowTimer.start()
+            } else {
+                if (toolTipShowTimer.running) {
+                    toolTipShowTimer.stop()
+                }
+
+                toolTip.close()
+            }
+        }
     }
 }
diff --git a/panels/dock/tray/package/ActionToggleCollapseDelegate.qml b/panels/dock/tray/package/ActionToggleCollapseDelegate.qml
@@ -5,10 +5,12 @@
 import QtQuick
 import QtQuick.Controls
 import org.deepin.dtk 1.0 as D
+import org.deepin.ds 1.0
 import org.deepin.ds.dock.tray 1.0 as DDT
 import org.deepin.ds.dock 1.0
 
 AppletItemButton {
+    id: root
     property bool isHorizontal: false
     property bool collapsed: DDT.TraySortOrderModel.collapsed
 
@@ -20,5 +22,36 @@ AppletItemButton {
 
     onClicked: {
         DDT.TraySortOrderModel.collapsed = !DDT.TraySortOrderModel.collapsed
+        toolTip.close()
+    }
+
+    PanelToolTip {
+        id: toolTip
+        text: qsTr("Collapse tray")
+        toolTipX: DockPanelPositioner.x
+        toolTipY: DockPanelPositioner.y
+    }
+    Timer {
+        id: toolTipShowTimer
+        interval: 200
+        onTriggered: {
+            var point = root.mapToItem(null, root.width / 2, root.height / 2)
+            toolTip.DockPanelPositioner.bounding = Qt.rect(point.x, point.y, toolTip.width, toolTip.height)
+            toolTip.open()
+        }
+    }
+    HoverHandler {
+        id: hoverHandler
+        onHoveredChanged: {
+            if (hovered) {
+                toolTipShowTimer.start()
+            } else {
+                if (toolTipShowTimer.running) {
+                    toolTipShowTimer.stop()
+                }
+
+                toolTip.close()
+            }
+        }
     }
 }