Skip to content

fix(dock): deduct column spacing from center space in non-fashion mode #1738

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

Open
mhduiy wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −0
Open

fix(dock): deduct column spacing from center space in non-fashion mode #1738

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions panels/dock/OverflowContainer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Item {
ListView {
id: listView
anchors.fill: parent
clip: true
orientation: useColumnLayout ? ListView.Vertical : ListView.Horizontal
layoutDirection: Qt.LeftToRight
verticalLayoutDirection: ListView.TopToBottom
Expand Down
7 changes: 7 additions & 0 deletions panels/dock/package/main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,13 @@ Window {
// 时尚模式下，dockRightPart 在 gridLayout 右侧，之间需要扣除 dockSpacing
// 同时保留左右悬浮间距，避免窗口铺满屏幕后圆角边框被屏幕边缘裁剪。
space -= Math.ceil(gridLayout.columnSpacing) * 2 + fashionDock.floatingMargin * 2;
} else if (gridLayout) {
// 非时尚模式下扣除 GridLayout 列间距，避免中间区域与右侧托盘区域重叠
let spacing = Math.ceil(gridLayout.columnSpacing);
space -= spacing;
if (dockLeftPart.visible) {
space -= spacing;
}
}
return Math.max(0, space);
}
Expand Down
Loading