Skip to content

fix: tray tooltip position incorrect for stashed area on treeland #1623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BLumia wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −19
Open

fix: tray tooltip position incorrect for stashed area on treeland #1623

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 9 additions & 19 deletions panels/dock/tray/SurfacePopup.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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 {
Expand All @@ -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)
Expand Down Expand Up @@ -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) {
Expand Down
Loading