fix(dock): raise dock to LayerOverlay on Wayland - #1697
Closed
wjyrich wants to merge 1 commit into
Closed
Conversation
点击任务栏插件区图标(网络/音量)弹出面板时,通知横幅(bubble)层级显示在面板上层。 根因:dock 为 LayerTop,bubble 为 LayerOverlay,dock 弹窗经 get_popup 继承 dock 层故低于 bubble。 修复:Wayland 下 dock 升至 LayerOverlay,弹窗继承 Overlay 后同层后映射在上压过 bubble。 X11 维持 LayerTop——x11dlayershellemulation 将 LayerOverlay 映射为 Notification 窗口类型, 会导致 KeepShowing 模式下 exclusionZone/strut 失效回归。 Log: 升级 dock 至 LayerOverlay(Wayland) 修复弹窗被通知横幅遮挡 Influence: dock 弹窗与通知横幅/通知中心/OSD 的 z-order 关系 PMS: BUG-373349
|
Skipping CI for Draft Pull Request. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: wjyrich The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Reviewer's guide (collapsed on small PRs)Reviewer's GuideOn Wayland, the dock’s layer is raised from LayerTop to LayerOverlay so dock popups inherit Overlay and render above notification bubbles, while preserving existing X11 behavior and strut semantics. File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
背景
点击任务栏插件区图标(网络/音量等)弹出面板时,通知横幅(bubble)层级显示在面板上层,应展示在下层。
根因
panels/dock/package/main.qml设DLayerShellWindow.layer: LayerToppanels/notification/bubble/package/main.qml设DLayerShellWindow.layer: LayerOverlayzwlr_layer_surface_v1.get_popup()挂到 dock 的 layer surface 上,继承 dock 的 LayerTop修复方案
Wayland 下将 dock 升至
LayerOverlay,弹窗继承 Overlay 后同层「后映射者在上方」压过 bubble:X11 维持
LayerTop——x11dlayershellemulation.cpp:110会将LayerOverlay映射为 Notification 窗口类型,导致 deepin kwin 下exclusionZone/strut 失效、KeepShowing 边缘预留回归。回归核对
treeland_window_overlap_checker):按几何检测窗口重叠触发 SmartHide,与 dock 所在 layer 无关,不受影响 ✅TreeLandDockWakeUpArea本就已是 LayerOverlay 先例,无异常 ✅关联
改动文件
panels/dock/package/main.qml(1 行实质改动 + 行内注释)Summary by Sourcery
Bug Fixes: