From 898307c6a6b90e66a41cfd837b516c0df263b507 Mon Sep 17 00:00:00 2001
From: Wang Zichong <wangzichong@deepin.org>
Date: Mon, 8 Jun 2026 15:28:41 +0800
Subject: [PATCH] fix: tray tooltip position incorrect for stashed area on
 treeland
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修正 treeland 会话下,向上收起的托盘区域中的图标 tooltip 位置不正确.

PMS: BUG-339313
Log:
---
 panels/dock/tray/SurfacePopup.qml | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/panels/dock/tray/SurfacePopup.qml b/panels/dock/tray/SurfacePopup.qml
index 122ae045e..c3a0027b2 100644
--- a/panels/dock/tray/SurfacePopup.qml
+++ b/panels/dock/tray/SurfacePopup.qml
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -17,16 +17,12 @@ Item {
     property int toolTipVOffset: 0
     signal popupCreated(var surfaceId)
 
-    PanelToolTipWindow {
-        id: toolTipWindow
-        onVisibleChanged: function (arg) {
-            if (arg && menuWindow.visible)
-                menuWindow.close()
-        }
-    }
     PanelToolTip {
         id: toolTip
-        toolTipWindow: toolTipWindow
+        onToolTipVisibleChanged: function (visible) {
+            if (visible && menuWindow.visible)
+                menuWindow.close()
+        }
 
         property alias shellSurface: surfaceLayer.shellSurface
         ShellSurfaceItemProxy {
@@ -39,17 +35,11 @@ Item {
         }
     }
 
-    WaylandOutput {
-        compositor: DockCompositor.compositor
-        window: toolTip.toolTipWindow
-        sizeFollowsWindow: false
-    }
-
     PanelMenuWindow {
         id: menuWindow
         onVisibleChanged: function (arg) {
-            if (arg && toolTipWindow.visible)
-                toolTipWindow.close()
+            if (arg && toolTip.toolTipVisible)
+                toolTip.close()
         }
         onUpdateGeometryFinished: function () {
             if (!menu.shellSurface)
@@ -128,10 +118,10 @@ Item {
 
                 toolTip.shellSurface = popupSurface
                 toolTip.toolTipX = Qt.binding(function () {
-                    return toolTip.shellSurface.x - toolTip.width / 2
+                    return Panel.popupWindow.xOffset + toolTip.shellSurface.x - toolTip.width / 2
                 })
                 toolTip.toolTipY = Qt.binding(function () {
-                    return toolTip.shellSurface.y - toolTip.height - toolTipVOffset
+                    return Panel.popupWindow.yOffset + toolTip.shellSurface.y - toolTip.height - toolTipVOffset
                 })
                 toolTip.open()
             } else if (popupSurface.popupType === Dock.TrayPopupTypeMenu) {