Skip to content

fix(dock): restore Wayland edge reveal - #1829

Merged
deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
mhduiy:fix-task-398935
Nov 19, 2026
Merged

deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
mhduiy:fix-task-398935

Conversation

@mhduiy

@mhduiy mhduiy commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor

Changes

  • Validate compositor-reported sizes before applying them to the dock layout.
  • Use the completed Wayland animation direction for final visibility. Keep both X11 animation paths unchanged.

Verification

  • Treeland: three bottom-edge reveal and re-hide cycles; screenshot confirmed rendering.
  • X11: centered and fashion layouts matched the unpatched package in visibility state and geometry. Neither build rendered in the isolated X11 fixture, so visual behavior was not verified there.

PMS: TASK-398935

Summary by Sourcery

Restore Wayland dock edge reveal behavior without changing X11 animation paths.

Bug Fixes:

  • Restore reliable Wayland dock edge reveal and re-hide visibility after compositor-driven animations.
  • Prevent stale compositor-reported dimensions from overriding the dock size during active resize animations.

Enhancements:

  • Preserve existing X11 animation visibility behavior while handling completed Wayland animations separately.

@sourcery-ai

sourcery-ai Bot commented Nov 19, 2026 •

Copy link
Copy Markdown

Reviewer's Guide

Implementation

Restrict compositor-reported size updates to active dock resizing so delayed animation geometry does not overwrite the saved dock size.

  • panels/dock/package/main.qml L897-898, L903 (removed lines), L909 (removed lines)

Set Wayland dock visibility from the completed animation direction while leaving the existing X11 visibility paths unchanged.

  • panels/dock/package/main.qml L217-225

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@github-actions

github-actions Bot commented Nov 19, 2026 •

Copy link
Copy Markdown

TAG Bot

TAG: 2.0.62
EXISTED: no
DISTRIBUTION: UNRELEASED

@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.

Hey - I've found 1 issue

Prompt for AI Agents
Please address the comments from this code review:

## Individual Comments

### Comment 1
<location path="panels/dock/package/main.qml" line_range="901" />
<code_context>
         function onWidthChanged() {
             if (dock.useColumnLayout) {
-                dock.dockSize = dock.width
                 Applet.dockSize = dock.width
             }
         }
</code_context>
<issue_to_address>
**Dock reopens at an unintended size**

When a compositor applies a queued, in-range intermediate resize after the hide/show animation stops, `onFinished` changes `dock.visible`, then the resize handler writes the intermediate `dock.width` to `Applet.dockSize`; `DockPanel::setDockSize` accepts it and `DockSettings` persists it, so the dock reopens at the unintended size.

Prevent compositor-driven intermediate resizes from being written to `Applet.dockSize` after the animation ends.

Also at `panels/dock/package/main.qml:221-224`.
</issue_to_address>

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

Comment thread panels/dock/package/main.qml Resolved
@deepin-ci-robot

deepin-ci-robot commented Nov 19, 2026 •

Copy link
Copy Markdown

⚠️ OBS CI 构建警告日志 (Commit: 7c4dabf4)

提示:以下为 OBS CI 构建中 Lintian 检测到的警告信息,默认折叠,点击展开查看详情。完整日志请参阅对应构建状态链接。

deepin_develop / aarch64 (Lintian 警告: 15 条)
[  967s] W: dde-shell: desktop-command-not-in-package bin/false [usr/share/applications/org.deepin.dde-shell.desktop]
[  967s] N: 
[  967s] N:   The desktop entry specifies a Command that does not match any of the
[  967s] N:   executables shipped in the package.
[  967s] N:   
[  967s] N:   This condition is often caused by a typo, or the desktop file was not
[  967s] N:   updated after the installed path of the executable was modified.
[  967s] N:   
[  967s] N:   Packages should ship executables that are used as commands in desktop
[  967s] N:   files.
[  967s] N: 
[  967s] N:   Visibility: warning
[  967s] N:   Show-Always: no
[  967s] N:   Check: menu-format
[  967s] N: 
[  967s] N:
[  967s] W: dde-shell: link-to-shared-library-in-wrong-package usr/lib/aarch64-linux-gnu/libds-notification-shared.so.2.0.61 [usr/lib/aarch64-linux-gnu/libds-notification-shared.so]
[  967s] N: 
[  967s] N:   Although this package is not a "-dev" package, it installs a
[  967s] N:   "libsomething.so" symbolic link referencing the corresponding shared
[  967s] N:   library. When the link doesn't include the version number, it is used by
[  967s] N:   the linker when other programs are built against this shared library.
[  967s] N:   
[  967s] N:   Shared libraries are supposed to place such symbolic links in their
[  967s] N:   respective "-dev" packages, so it is a bug to include it with the main
[  967s] N:   library package.
[  967s] N:   
[  967s] N:   However, if this is a small package which includes the runtime and the
[  967s] N:   development libraries, this is not a bug. In the latter case, please
[  967s] N:   override this warning.
[  967s] N: 
[  967s] N:   Please refer to Development files (Section 8.4) in the Debian Policy
[  967s] N:   Manual for details.
[  967s] N: 
[  967s] N:   Visibility: warning
[  967s] N:   Show-Always: no
[  967s] N:   Check: libraries/shared/links
[  967s] N:   Renamed from: non-dev-pkg-with-shlib-symlink
[  967s] N: 
[  967s] N:
[  967s] W: dde-shell: no-manual-page [usr/bin/dde-shell]
[  967s] N: 
[  967s] N:   Each binary in /usr/bin, /usr/sbin, /bin, /sbin or /usr/games should have
[  967s] N:   a manual page
[  967s] N:   
[  967s] N:   Note that though the man program has the capability to check for several
[  967s] N:   program names in the NAMES section, each of these programs should have its
[  967s] N:   own manual page (a symbolic link to the appropriate manual page is
[  967s] N:   sufficient) because other manual page viewers such as xman or tkman don't
[  967s] N:   support this.
[  967s] N:   
[  967s] N:   If the name of the manual page differs from the binary by case, man may be
[  967s] N:   able to find it anyway; however, it is still best practice to match the
[  967s] N:   exact capitalization of the executable in the manual page.
[  967s] N:   
[  967s] N:   If the manual pages are provided by another package on which this package
[  967s] N:   depends, Lintian may not be able to determine that manual pages are
[  967s] N:   available. In this case, after confirming that all binaries do have manual
[  967s] N:   pages after this package and its dependencies are installed, please add a
[  967s] N:   Lintian override.
[  967s] N: 
[  967s] N:   Please refer to Manual pages (Section 12.1) in the Debian Policy Manual
[  967s] N:   for details.
[  967s] N: 
[  967s] N:   Visibility: warning
[  967s] N:   Show-Always: no
[  967s] N:   Check: documentation/manual
[  967s] N:   Renamed from: binary-without-manpage
[  967s] N: 
[  967s] N:
[  967s] W: dde-shell source: no-nmu-in-changelog [debian/changelog:1]
[  967s] N: 
[  967s] N:   When you NMU a package, that fact should be mentioned on the first line in
[  967s] N:   the changelog entry. Use the words "NMU" or "Non-maintainer upload" (case
[  967s] N:   insensitive).
[  967s] N:   
[  967s] N:   Maybe you didn't intend this upload to be a NMU, in that case, please
[  967s] N:   double-check that the most recent entry in the changelog is byte-for-byte
[  967s] N:   identical to the maintainer or one of the uploaders. If this is a local
[  967s] N:   package (not intended for Debian), you can suppress this warning by
[  967s] N:   putting "local" in the version number or "local package" on the first line
[  967s] N:   of the changelog entry.
[  967s] N: 
[  967s] N:   Please refer to Using the DELAYED/ queue (Section 5.11.3) in the Debian
[  967s] N:   Developer's Reference for details.
[  967s] N: 
[  967s] N:   Visibility: warning
[  967s] N:   Show-Always: no
[  967s] N:   Check: nmu
[  967s] N:   Renamed from: changelog-should-mention-nmu
[  967s] N: 
[  967s] N:
[  967s] W: dde-shell: package-name-doesnt-match-sonames libds-notification-shared2
[  967s] N: 
[  967s] N:   The package name of a library package should usually reflect the soname of
[  967s] N:   the included library. The package name can determined from the library
[  967s] N:   file name with the following code snippet:
[  967s] N:   
[  967s] N:    $ objdump -p /path/to/libfoo-bar.so.1.2.3 | sed -n -e's/^[[:space:]]*SONAME[[:space:]]*//p' | \
[  967s] N:        sed -r -e's/([0-9])\.so\./\1-/; s/\.so(\.|$)//; y/_/-/; s/(.*)/\L&/'
[  967s] N: 
[  967s] N:   Visibility: warning
[  967s] N:   Show-Always: no
[  967s] N:   Check: libraries/shared/soname
[  967s] N: 
[  967s] N:
[  967s] W: libdde-shell: package-name-doesnt-match-sonames libdde-shell1
[  967s] N:
[  967s] W: libdde-shell-dock: package-name-doesnt-match-sonames libdde-shell-dock1
[  967s] N:
[  967s] W: dde-shell source: source-nmu-has-incorrect-version-number 2.0.61+u028 [debian/changelog:1]
[  967s] N: 
[  967s] N:   A source NMU should have a Debian revision of "-x.x" (or "+nmuX" for a
[  967s] N:   native package). This is to prevent stealing version numbers from the
[  967s] N:   maintainer.
[  967s] N:   
[  967s] N:   Maybe you didn't intend this upload to be a NMU, in that case, please
[  967s] N:   double-check that the most recent entry in the changelog is byte-for-byte
[  967s] N:   identical to the maintainer or one of the uploaders. If this is a local
[  967s] N:   package (not intended for Debian), you can suppress this warning by
[  967s] N:   putting "local" in the version number or "local package" on the first line
[  967s] N:   of the changelog entry.
[  967s] N: 
[  967s] N:   Please refer to NMUs and debian/changelog (Section 5.11.2) in the Debian
[  967s] N:   Developer's Reference for details.
[  967s] N: 
[  967s] N:   Visibility: warning
[  967s] N:   Show-Always: no
[  967s] N:   Check: nmu
[  967s] N: 
[  967s] N:
[  967s] W: dde-shell: unknown-section DDE
[  967s] N: 
[  967s] N:   The "Section:" field in this package's control file is not one of the
[  967s] N:   sections in use on the ftp archive. Valid sections are currently admin,
[  967s] N:   comm, cli-mono, database, debug, devel, doc, editors, electronics,
[  967s] N:   embedded, fonts, games, gnome, gnu-r, gnustep, graphics, hamradio,
[  967s] N:   haskell, httpd, interpreters, java, javascript, kde, libdevel, libs, lisp,
[  967s] N:   localization, kernel, mail, math, misc, net, news, ocaml, oldlibs,
[  967s] N:   otherosfs, perl, php, python, ruby, rust, science, shells, sound, tex,
[  967s] N:   text, utils, vcs, video, web, x11, xfce, zope.
[  967s] N:   
[  967s] N:   The section name should be preceded by either "contrib/", "non-free/" or
[  967s] N:   "non-free-firmware/" if the package is in the according archive area.
[  967s] N: 
[  967s] N:   Please refer to Sections (Section 2.4) in the Debian Policy Manual for
[  967s] N:   details.
[  967s] N: 
[  967s] N:   Visibility: warning
[  967s] N:   Show-Always: no
[  967s] N:   Check: fields/section
[  967s] N: 
[  967s] N:
[  967s] W: dde-shell-example: unknown-section DDE
[  967s] N:
[  967s] W: libdde-shell: unknown-section DDE
[  967s] N:
[  967s] W: libdde-shell-dev: unknown-section DDE
[  967s] N:
[  967s] W: libdde-shell-dock: unknown-section DDE
[  967s] N:
[  967s] W: libdde-shell-dock-dev: unknown-section DDE
[  968s] Warning: mkbaselibs missing in build root, skipping baselibs
deepin_develop / x86_64 (Lintian 警告: 15 条)
[  415s] W: dde-shell: desktop-command-not-in-package bin/false [usr/share/applications/org.deepin.dde-shell.desktop]
[  415s] N: 
[  415s] N:   The desktop entry specifies a Command that does not match any of the
[  415s] N:   executables shipped in the package.
[  415s] N:   
[  415s] N:   This condition is often caused by a typo, or the desktop file was not
[  415s] N:   updated after the installed path of the executable was modified.
[  415s] N:   
[  415s] N:   Packages should ship executables that are used as commands in desktop
[  415s] N:   files.
[  415s] N: 
[  415s] N:   Visibility: warning
[  415s] N:   Show-Always: no
[  415s] N:   Check: menu-format
[  415s] N: 
[  415s] N:
[  415s] W: dde-shell: link-to-shared-library-in-wrong-package usr/lib/x86_64-linux-gnu/libds-notification-shared.so.2.0.61 [usr/lib/x86_64-linux-gnu/libds-notification-shared.so]
[  415s] N: 
[  415s] N:   Although this package is not a "-dev" package, it installs a
[  415s] N:   "libsomething.so" symbolic link referencing the corresponding shared
[  415s] N:   library. When the link doesn't include the version number, it is used by
[  415s] N:   the linker when other programs are built against this shared library.
[  415s] N:   
[  415s] N:   Shared libraries are supposed to place such symbolic links in their
[  415s] N:   respective "-dev" packages, so it is a bug to include it with the main
[  415s] N:   library package.
[  415s] N:   
[  415s] N:   However, if this is a small package which includes the runtime and the
[  415s] N:   development libraries, this is not a bug. In the latter case, please
[  415s] N:   override this warning.
[  415s] N: 
[  415s] N:   Please refer to Development files (Section 8.4) in the Debian Policy
[  415s] N:   Manual for details.
[  415s] N: 
[  415s] N:   Visibility: warning
[  415s] N:   Show-Always: no
[  415s] N:   Check: libraries/shared/links
[  415s] N:   Renamed from: non-dev-pkg-with-shlib-symlink
[  415s] N: 
[  415s] N:
[  415s] W: dde-shell: no-manual-page [usr/bin/dde-shell]
[  415s] N: 
[  415s] N:   Each binary in /usr/bin, /usr/sbin, /bin, /sbin or /usr/games should have
[  415s] N:   a manual page
[  415s] N:   
[  415s] N:   Note that though the man program has the capability to check for several
[  415s] N:   program names in the NAMES section, each of these programs should have its
[  415s] N:   own manual page (a symbolic link to the appropriate manual page is
[  415s] N:   sufficient) because other manual page viewers such as xman or tkman don't
[  415s] N:   support this.
[  415s] N:   
[  415s] N:   If the name of the manual page differs from the binary by case, man may be
[  415s] N:   able to find it anyway; however, it is still best practice to match the
[  415s] N:   exact capitalization of the executable in the manual page.
[  415s] N:   
[  415s] N:   If the manual pages are provided by another package on which this package
[  415s] N:   depends, Lintian may not be able to determine that manual pages are
[  415s] N:   available. In this case, after confirming that all binaries do have manual
[  415s] N:   pages after this package and its dependencies are installed, please add a
[  415s] N:   Lintian override.
[  415s] N: 
[  415s] N:   Please refer to Manual pages (Section 12.1) in the Debian Policy Manual
[  415s] N:   for details.
[  415s] N: 
[  415s] N:   Visibility: warning
[  415s] N:   Show-Always: no
[  415s] N:   Check: documentation/manual
[  415s] N:   Renamed from: binary-without-manpage
[  415s] N: 
[  415s] N:
[  415s] W: dde-shell source: no-nmu-in-changelog [debian/changelog:1]
[  415s] N: 
[  415s] N:   When you NMU a package, that fact should be mentioned on the first line in
[  415s] N:   the changelog entry. Use the words "NMU" or "Non-maintainer upload" (case
[  415s] N:   insensitive).
[  415s] N:   
[  415s] N:   Maybe you didn't intend this upload to be a NMU, in that case, please
[  415s] N:   double-check that the most recent entry in the changelog is byte-for-byte
[  415s] N:   identical to the maintainer or one of the uploaders. If this is a local
[  415s] N:   package (not intended for Debian), you can suppress this warning by
[  415s] N:   putting "local" in the version number or "local package" on the first line
[  415s] N:   of the changelog entry.
[  415s] N: 
[  415s] N:   Please refer to Using the DELAYED/ queue (Section 5.11.3) in the Debian
[  415s] N:   Developer's Reference for details.
[  415s] N: 
[  415s] N:   Visibility: warning
[  415s] N:   Show-Always: no
[  415s] N:   Check: nmu
[  415s] N:   Renamed from: changelog-should-mention-nmu
[  415s] N: 
[  415s] N:
[  415s] W: dde-shell: package-name-doesnt-match-sonames libds-notification-shared2
[  415s] N: 
[  415s] N:   The package name of a library package should usually reflect the soname of
[  415s] N:   the included library. The package name can determined from the library
[  415s] N:   file name with the following code snippet:
[  415s] N:   
[  415s] N:    $ objdump -p /path/to/libfoo-bar.so.1.2.3 | sed -n -e's/^[[:space:]]*SONAME[[:space:]]*//p' | \
[  415s] N:        sed -r -e's/([0-9])\.so\./\1-/; s/\.so(\.|$)//; y/_/-/; s/(.*)/\L&/'
[  415s] N: 
[  415s] N:   Visibility: warning
[  415s] N:   Show-Always: no
[  415s] N:   Check: libraries/shared/soname
[  415s] N: 
[  415s] N:
[  415s] W: libdde-shell: package-name-doesnt-match-sonames libdde-shell1
[  415s] N:
[  415s] W: libdde-shell-dock: package-name-doesnt-match-sonames libdde-shell-dock1
[  415s] N:
[  415s] W: dde-shell source: source-nmu-has-incorrect-version-number 2.0.61+u028 [debian/changelog:1]
[  415s] N: 
[  415s] N:   A source NMU should have a Debian revision of "-x.x" (or "+nmuX" for a
[  415s] N:   native package). This is to prevent stealing version numbers from the
[  415s] N:   maintainer.
[  415s] N:   
[  415s] N:   Maybe you didn't intend this upload to be a NMU, in that case, please
[  415s] N:   double-check that the most recent entry in the changelog is byte-for-byte
[  415s] N:   identical to the maintainer or one of the uploaders. If this is a local
[  415s] N:   package (not intended for Debian), you can suppress this warning by
[  415s] N:   putting "local" in the version number or "local package" on the first line
[  415s] N:   of the changelog entry.
[  415s] N: 
[  415s] N:   Please refer to NMUs and debian/changelog (Section 5.11.2) in the Debian
[  415s] N:   Developer's Reference for details.
[  415s] N: 
[  415s] N:   Visibility: warning
[  415s] N:   Show-Always: no
[  415s] N:   Check: nmu
[  415s] N: 
[  415s] N:
[  415s] W: dde-shell: unknown-section DDE
[  415s] N: 
[  415s] N:   The "Section:" field in this package's control file is not one of the
[  415s] N:   sections in use on the ftp archive. Valid sections are currently admin,
[  415s] N:   comm, cli-mono, database, debug, devel, doc, editors, electronics,
[  415s] N:   embedded, fonts, games, gnome, gnu-r, gnustep, graphics, hamradio,
[  415s] N:   haskell, httpd, interpreters, java, javascript, kde, libdevel, libs, lisp,
[  415s] N:   localization, kernel, mail, math, misc, net, news, ocaml, oldlibs,
[  415s] N:   otherosfs, perl, php, python, ruby, rust, science, shells, sound, tex,
[  415s] N:   text, utils, vcs, video, web, x11, xfce, zope.
[  415s] N:   
[  415s] N:   The section name should be preceded by either "contrib/", "non-free/" or
[  415s] N:   "non-free-firmware/" if the package is in the according archive area.
[  415s] N: 
[  415s] N:   Please refer to Sections (Section 2.4) in the Debian Policy Manual for
[  415s] N:   details.
[  415s] N: 
[  415s] N:   Visibility: warning
[  415s] N:   Show-Always: no
[  415s] N:   Check: fields/section
[  415s] N: 
[  415s] N:
[  415s] W: dde-shell-example: unknown-section DDE
[  415s] N:
[  415s] W: libdde-shell: unknown-section DDE
[  415s] N:
[  415s] W: libdde-shell-dev: unknown-section DDE
[  415s] N:
[  415s] W: libdde-shell-dock: unknown-section DDE
[  415s] N:
[  415s] W: libdde-shell-dock-dev: unknown-section DDE
[  415s] Warning: mkbaselibs missing in build root, skipping baselibs

1. Set dock visibility from the completed Wayland animation direction.
2. Save compositor-reported sizes only during an active dock drag.

Log: Keep delayed animation sizes out of dock settings.
Influence: X11 behavior is unchanged.

fix(dock): 修复 Wayland 任务栏边缘唤出

1. 按 Wayland 动画完成时的方向设置任务栏可见性。
2. 仅在拖拽任务栏时保存合成器回报的尺寸。

Log: 避免迟到的动画尺寸写入任务栏设置。
PMS: TASK-398935
Influence: 不改变 X11 行为。
@deepin-ci-robot

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

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

@mhduiy

mhduiy commented Nov 19, 2026

Copy link
Copy Markdown
Contributor Author

/forcemerge

@deepin-bot

deepin-bot Bot commented Nov 19, 2026

Copy link
Copy Markdown

This pr force merged! (status: behind)

@deepin-bot
deepin-bot Bot merged commit 930bca1 into linuxdeepin:master Nov 19, 2026
12 of 13 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