Skip to content

fix: correct task manager space calculation for window split mode #1655

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
Jun 30, 2026
Merged

fix: correct task manager space calculation for window split mode #1655

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
17 changes: 12 additions & 5 deletions panels/dock/taskmanager/package/TaskManager.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@ ContainmentItem {
id: taskmanager
property bool useColumnLayout: Panel.rootObject.useColumnLayout
property int dockOrder: 16
readonly property real remainingSpacesForTaskManager: {

function calcRemainingSpace(baseSize) {
const otherCount = Panel.rootObject.dockCenterPartCount - 1;
const otherOccupied = otherCount > 0 ? otherCount * Panel.rootObject.dockItemMaxSize * 0.8 : 0;
const otherOccupied = otherCount > 0 ? otherCount * baseSize * multitaskViewIconRatio : 0;
return Panel.rootObject.dockRawCenterSpace - otherOccupied;
}

readonly property real remainingSpacesForTaskManager: calcRemainingSpace(Panel.rootObject.dockItemMaxSize)
readonly property int appTitleSpacing: Math.max(10, Math.round(Panel.rootObject.dockItemMaxSize * 9 / 14) / 3)
// Start padding for the app container so that the visual gap
// (multitask icon right edge → first app icon left edge) = appTitleSpacing.
Expand Down Expand Up @@ -80,11 +83,15 @@ ContainmentItem {
id: textCalculator
enabled: taskmanager.Applet.windowSplit && (Panel.position == Dock.Bottom || Panel.position == Dock.Top)
dataModel: taskmanager.Applet.dataModel
iconSize: Panel.rootObject.dockItemMaxSize * 9 / 14
spacing: appContainer.spacing
iconSize: Panel.rootObject.dockSize * 9 / 14
spacing: Math.max(10, Math.round(textCalculator.iconSize) / 3)
cellSize: textCalculator.iconSize
itemPadding: Math.round(textCalculator.iconSize / 8)
remainingSpace: taskmanager.remainingSpacesForTaskManager - taskmanager.startPadding
remainingSpace: {
const dockIconSize = Panel.rootObject.dockSize;
const startPadding = Math.max(0, textCalculator.spacing - (dockIconSize * (multitaskViewIconRatio - iconWidthToMaxSizeRatio) / 2));
return calcRemainingSpace(dockIconSize) - startPadding;
}
font.family: D.DTK.fontManager.t6.family
font.pixelSize: Math.max(10, Math.min(20, Math.round(textCalculator.iconSize * 0.35)))
}
Expand Down
Loading