Skip to content

fix(dock): smart hide fails to show dock after window dragged away #1668

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

Merged
deepin-bot merged 1 commit into from
Jul 16, 2026
Merged

fix(dock): smart hide fails to show dock after window dragged away #1668

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
29 changes: 16 additions & 13 deletions panels/dock/package/main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ Window {
id: hideShowAnimation;
// Currently, Wayland (Treeland) doesn't support StyledBehindWindowBlur inside the window, thus we keep using the window size approach on Wayland
property bool useTransformBasedAnimation: Qt.platform.pluginName === "xcb"
property bool hiding: false
target: useTransformBasedAnimation ? dockTransform : dock;
property: {
if (useTransformBasedAnimation) return dock.useColumnLayout ? "x" : "y";
Expand All @@ -118,6 +119,7 @@ Window {
duration: 500
easing.type: Easing.OutCubic
onStarted: {
hiding = Panel.hideState === Dock.Hide
dock.visible = true
}
onStopped: {
Expand Down Expand Up @@ -253,15 +255,10 @@ Window {
setTransformToHiddenPosition();

startAnimation(true);
} else if (isShowing) {
// After show animation completes, check if we need to auto-hide
// For KeepHidden and SmartHide modes, trigger hide check immediately
if (Panel.hideMode === Dock.KeepHidden || Panel.hideMode === Dock.SmartHide) {
hideTimer.running = true;
} else if (Panel.hideState === Dock.Hide) {
// For other cases, if hideState is already Hide, trigger hide animation
hideTimer.running = true;
}
} else if (isShowing && Panel.hideState === Dock.Hide) {
// Restore the backend-requested hidden state after the
// position-change show animation has completed.
hideTimer.restart();
}
}
}
Expand Down Expand Up @@ -735,6 +732,8 @@ Window {

Connections {
function onBeforePositionChanged(beforePosition) {
// Prevent the delayed hide animation from racing the position animation.
hideTimer.stop();
// Stop any running animations first
dockAnimation.stop();
hideShowAnimation.stop();
Expand Down Expand Up @@ -776,12 +775,16 @@ Window {

function onHideStateChanged() {
if (Panel.hideState === Dock.Hide) {
hideTimer.running = true
} else {
// Only restart animation if not already running or if visible state doesn't match
if (!hideShowAnimation.running || !dock.visible) {
hideTimer.restart()
} else if (Panel.hideState === Dock.Show) {
hideTimer.stop()

// Reverse an in-flight hide animation, but do not restart an
// animation that is already moving towards the shown state.
if (!hideShowAnimation.running || hideShowAnimation.hiding || !dock.visible) {
hideShowAnimation.restart()
}
dock.visible = true
}
}
function onRequestClosePopup() {
Expand Down
Loading