Skip to content

revert: "fix: correct dock context menu popup positioning"#1648

Merged
deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
yixinshark:revert/popup-focus-menu-conflict
Jun 24, 2026
Merged

revert: "fix: correct dock context menu popup positioning"#1648
deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
yixinshark:revert/popup-focus-menu-conflict

Conversation

@yixinshark

Copy link
Copy Markdown
Contributor

This reverts commit b236970.

原因

引入 DTK popup window 菜单后,popup 窗口会主动夺取输入焦点,导致 dock 右键菜单出现 一级菜单与二级菜单互抢焦点 的问题:

  • 二级(子)菜单弹出时会从一级菜单抢走焦点;
  • 一级菜单因失去焦点而异常关闭 / 闪烁;
  • 用户无法正常完成多级菜单的交互。

处理方案

先回退至原先的 Qt.labs.platform 菜单方案,恢复稳定的菜单交互行为。待焦点抢夺问题彻底定位并修复后,再重新引入 DTK popup window 菜单(含 PopupHandle 模糊效果)。

影响文件

  • panels/dock/MenuHelper.qml
  • panels/dock/package/main.qml
  • panels/dock/taskmanager/package/AppItem.qml
  • debian/control(回退 libdtk6declarative (>> 6.7.44) 版本约束)

验证

  • 编译通过
  • dock 空白区域右键菜单交互正常
  • taskmanager 应用项右键菜单交互正常
  • 触摸屏长按弹出菜单交互正常

This reverts commit b236970.

引入 popup 窗口菜单后,popup 会主动夺取输入焦点,导致 dock 右键
一级菜单与展开后的二级菜单之间出现互抢焦点的问题:二级菜单弹出
时会从一级菜单抢走焦点,进而触发一级菜单异常关闭或交互错乱。

先回退至 Qt.labs.platform 菜单方案,待焦点抢夺问题彻底解决后再
重新引入 DTK popup window 菜单。

Log: revert popup menu due to focus stealing between primary and submenu

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry @yixinshark, you have reached your weekly rate limit of 500000 diff characters.

Please try again later or upgrade to continue using Sourcery

@deepin-ci-robot

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: mhduiy, yixinshark

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@yixinshark

Copy link
Copy Markdown
Contributor Author

/forcemerge

@deepin-bot

deepin-bot Bot commented Jun 24, 2026

Copy link
Copy Markdown

This pr force merged! (status: blocked)

@deepin-bot deepin-bot Bot merged commit c88557b into linuxdeepin:master Jun 24, 2026
7 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants