fix: 修复任务栏位置切换时的显示异常 #1400
Open
fix: 修复任务栏位置切换时的显示异常 #1400
Conversation
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
通过改进位置切换逻辑，实现平滑的过渡动画： 1. 在切换位置时，先保存新位置并临时恢复到旧位置 2. 在旧位置播放隐藏动画 3. 切换到新位置后，从隐藏状态播放显示动画 4. 使用状态标志精确控制动画流程，避免闪烁和显示异常 这样可以确保任务栏在位置切换时不会出现空白区域、内容溢出或突然跳变的问题。 Log: 修复任务栏位置切换时的显示异常 PMS: BUG-346777
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: Ivy233 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 GuideRefines the dock’s position-change handling by decoupling menu actions from animation callbacks and introducing a robust, state-driven animation flow that hides the dock at the old position, switches logical position, and then shows it at the new position without visual glitches. Sequence diagram for dock position change animation flowsequenceDiagram
actor User
participant MenuItem
participant Applet
participant Panel
participant positionChangeConnections
participant dockAnimation
participant dock
participant hideShowAnimation
User->>MenuItem: select new position value
MenuItem->>Applet: set position value
Applet->>Panel: update position
Panel-->>positionChangeConnections: onPositionChanged
activate positionChangeConnections
positionChangeConnections->>positionChangeConnections: check isRestoringPosition
alt isRestoringPosition true
positionChangeConnections-->>positionChangeConnections: return (ignore change)
else isRestoringPosition false
positionChangeConnections->>positionChangeConnections: savedNewPosition = Panel.position
positionChangeConnections->>positionChangeConnections: isRestoringPosition = true
positionChangeConnections->>Applet: position = previousPosition
positionChangeConnections->>positionChangeConnections: isRestoringPosition = false
positionChangeConnections->>dockAnimation: stop
positionChangeConnections->>hideShowAnimation: stop
positionChangeConnections->>dockAnimation: isPositionChanging = true
positionChangeConnections->>Panel: read hideState
positionChangeConnections->>dock: read visible
alt Panel.hideState is Hide and dock not visible
positionChangeConnections->>dockAnimation: isPositionChanging = false
positionChangeConnections->>positionChangeConnections: handlePositionChangeAfterHide
else dock is visible
positionChangeConnections->>dockAnimation: startAnimation(false)
end
end
deactivate positionChangeConnections
rect rgb(230,230,255)
dockAnimation-->>dockAnimation: onStopped
alt isPositionChanging true and isShowing false
dockAnimation->>dockAnimation: isPositionChanging = false
dockAnimation->>positionChangeConnections: handlePositionChangeAfterHide
else isShowing true
dockAnimation->>Panel: read hideState
alt Panel.hideState is Hide
dockAnimation->>hideTimer: start
end
end
end
rect rgb(230,255,230)
positionChangeConnections->>positionChangeConnections: handlePositionChangeAfterHide
positionChangeConnections->>positionChangeConnections: update previousPosition
positionChangeConnections->>Applet: position = savedNewPosition
positionChangeConnections->>positionChangeConnections: savedNewPosition = -1
positionChangeConnections->>Panel: changeDragAreaAnchor
positionChangeConnections->>Panel: requestClosePopup
positionChangeConnections->>dockAnimation: configure dockTransform for hidden offset
positionChangeConnections->>dockAnimation: startAnimation(true)
end
Updated class diagram for dockAnimation and positionChangeConnectionsclassDiagram
class DockAnimation {
bool useTransformBasedAnimation
bool isShowing
bool isPositionChanging
var target
string animProperty
startAnimation(show)
stop()
onStopped()
}
class PositionChangeConnections {
int previousPosition
int savedNewPosition
bool isRestoringPosition
onPositionChanged()
handlePositionChangeAfterHide()
onDockSizeChanged()
onCompleted()
}
class Dock {
bool visible
bool useColumnLayout
int width
int height
}
class DockTransform {
int x
int y
}
class Panel {
int position
int dockSize
int hideState
requestClosePopup()
changeDragAreaAnchor()
}
class Applet {
int position
}
DockAnimation --> Dock : animates
DockAnimation --> DockTransform : uses
PositionChangeConnections --> DockAnimation : controls
PositionChangeConnections --> Panel : updates
PositionChangeConnections --> Applet : restores_and_applies_position
PositionChangeConnections --> DockTransform : sets_hidden_offset
Panel --> Dock : configures_size
Flow diagram for dock position change and animation statesflowchart TD
A[User changes dock position via menu] --> B[Panel.position changes]
B --> C[onPositionChanged in positionChangeConnections]
C --> D{isRestoringPosition}
D -->|true| E[Return, ignore change]
D -->|false| F[Save savedNewPosition from Panel.position]
F --> G[Set isRestoringPosition = true]
G --> H[Restore Applet.position to previousPosition]
H --> I[Set isRestoringPosition = false]
I --> J[Stop dockAnimation and hideShowAnimation]
J --> K[Set dockAnimation.isPositionChanging = true]
K --> L{Panel.hideState is Hide and dock not visible}
L -->|true| M[Set dockAnimation.isPositionChanging = false]
M --> N[handlePositionChangeAfterHide]
L -->|false| O["startAnimation(false) for hide"]
O --> P[dockAnimation onStopped]
P --> Q{isPositionChanging and not isShowing}
Q -->|true| R[Set isPositionChanging = false]
R --> N
Q -->|false| S{isShowing and Panel.hideState is Hide}
S -->|true| T[start hideTimer]
S -->|false| U[End]
N --> V{savedNewPosition is valid}
V -->|false| U
V -->|true| W[Set previousPosition = savedNewPosition]
W --> X[Apply Applet.position = savedNewPosition]
X --> Y[Reset savedNewPosition = -1]
Y --> Z[changeDragAreaAnchor and requestClosePopup]
Z --> AA[Set dockTransform to hidden offset based on position]
AA --> AB["startAnimation(true) for show"]
AB --> AC[dockAnimation onStopped with isShowing true]
AC --> AD{Panel.hideState is Hide}
AD -->|true| T
AD -->|false| U
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
deepin pr auto review这段代码主要实现了 Dock（任务栏）在切换位置（如从底部切换到左侧）时的动画过渡逻辑，确保在 Dock 隐藏后再改变位置，然后再显示出来，从而避免视觉上的闪烁或布局错乱。 以下是对该 1. 语法逻辑
2. 代码质量
3. 代码性能
4. 代码安全
总结与改进建议代码总体而言，这段代码修复了 Dock 切换位置时的闪烁问题，逻辑较为严谨。主要改进点在于增强对并发状态变更的防御性编程。 改进建议代码片段（针对 Connections {
id: positionChangeConnections
property int previousPosition: Panel.position
property int savedNewPosition: -1
property bool isRestoringPosition: false
function onPositionChanged() {
// 1. 防御性检查：忽略由我们自己恢复操作触发的变化
if (isRestoringPosition) {
return;
}
// 2. 防御性检查：如果当前正在进行位置切换动画，忽略新的请求或更新目标位置
// (这里选择忽略以保持状态机简单，也可以选择更新 savedNewPosition)
if (dockAnimation.isPositionChanging) {
console.warn("Position change ignored: animation already in progress.");
return;
}
// 保存新位置
savedNewPosition = Panel.position;
// 标记开始恢复操作
isRestoringPosition = true;
// 恢复到旧位置以触发隐藏动画
Applet.position = previousPosition;
// 恢复操作完成（注意：Applet.position 的赋值是同步的，但信号触发是异步的，
// 由于上面有 isRestoringPosition 守卫，这里立即重置是安全的）
isRestoringPosition = false;
// 停止现有动画
dockAnimation.stop();
hideShowAnimation.stop();
// 标记开始位置变更流程
dockAnimation.isPositionChanging = true;
// 执行隐藏动画
if (Panel.hideState === Dock.Hide && !dock.visible) {
dockAnimation.isPositionChanging = false;
handlePositionChangeAfterHide();
} else {
dockAnimation.startAnimation(false);
}
}
// ... handlePositionChangeAfterHide 保持不变 ...
}补充说明： |
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey - I've left some high level feedback:
- The
dockAnimation.isPositionChangingflag is only reset inonStoppedand the early-return path for hidden docks; if the animation is interrupted (e.g., by another position change or a manualstop()), this flag may remain true and affect later animations—consider centralizing state reset so all code paths that stop animations clear this flag consistently. - In the
Connectionshandler foronPositionChanged, theisRestoringPositionflag is set and immediately cleared after assigningApplet.position; this relies on synchronous behavior of the signal emission—if this logic ever changes or other async work is added, it may become brittle, so consider scoping the restore logic into a helper that manages the flag with a clearer critical section.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- The `dockAnimation.isPositionChanging` flag is only reset in `onStopped` and the early-return path for hidden docks; if the animation is interrupted (e.g., by another position change or a manual `stop()`), this flag may remain true and affect later animations—consider centralizing state reset so all code paths that stop animations clear this flag consistently.
- In the `Connections` handler for `onPositionChanged`, the `isRestoringPosition` flag is set and immediately cleared after assigning `Applet.position`; this relies on synchronous behavior of the signal emission—if this logic ever changes or other async work is added, it may become brittle, so consider scoping the restore logic into a helper that manages the flag with a clearer critical section.Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
通过改进位置切换逻辑，实现平滑的过渡动画：
这样可以确保任务栏在位置切换时不会出现空白区域、内容溢出或突然跳变的问题。
Log: 修复任务栏位置切换时的显示异常
PMS: BUG-346777
Summary by Sourcery
Improve dock position change handling to provide smooth hide/show transitions and avoid visual glitches when moving the taskbar.
Bug Fixes:
Enhancements: