Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-05-12 15:29:43 -04:00
Code Packages Releases Activity

osd: fix positioning with multiple bars

Browse Source 
fixes #2387
This commit is contained in:
bbedward
2026-05-11 09:51:02 -04:00
parent a5352623fd
commit b192b5f779
1 changed files with 46 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
quickshell/Widgets/DankOSD.qml
View File

@@ -129,22 +129,46 @@ PanelWindow {
readonly property bool isVerticalLayout: SettingsData.osdPosition === SettingsData.Position.LeftCenter || SettingsData.osdPosition === SettingsData.Position.RightCenter readonly property bool isVerticalLayout: SettingsData.osdPosition === SettingsData.Position.LeftCenter || SettingsData.osdPosition === SettingsData.Position.RightCenter
readonly property real barThickness: { readonly property var barEdgeOffsets: {
const defaultBar = SettingsData.barConfigs[0] || SettingsData.getBarConfig("default"); const offsets = {
if (!defaultBar || !(defaultBar.visible ?? true)) "top": 0,
return 0; "bottom": 0,
const innerPadding = defaultBar.innerPadding ?? 4; "left": 0,
const widgetThickness = Math.max(20, 26 + innerPadding * 0.6); "right": 0
return Math.max(widgetThickness + innerPadding + 4, Theme.barHeight - 4 - (8 - innerPadding)); };
} const configs = SettingsData.barConfigs;
if (!screen || !configs)
readonly property real barOffset: { return offsets;
const defaultBar = SettingsData.barConfigs[0] || SettingsData.getBarConfig("default"); const defaultBar = configs[0] || SettingsData.getBarConfig("default");
if (!defaultBar || !(defaultBar.visible ?? true)) for (var i = 0; i < configs.length; i++) {
return 0; const bc = configs[i];
const spacing = defaultBar.spacing ?? 4; if (!bc || !(bc.enabled ?? true) || !(bc.visible ?? true))
const bottomGap = defaultBar.bottomGap ?? 0; continue;
return barThickness + spacing + bottomGap; const prefs = bc.screenPreferences || ["all"];
if (!prefs.includes("all") && !SettingsData.isScreenInPreferences(screen, prefs))
continue;
const innerPadding = bc.innerPadding ?? (defaultBar?.innerPadding ?? 4);
const widgetThickness = Math.max(20, 26 + innerPadding * 0.6);
const thickness = Math.max(widgetThickness + innerPadding + 4, Theme.barHeight - 4 - (8 - innerPadding));
const spacing = bc.spacing ?? (defaultBar?.spacing ?? 4);
const bottomGap = bc.bottomGap ?? (defaultBar?.bottomGap ?? 0);
const offset = thickness + spacing + bottomGap;
switch (bc.position ?? SettingsData.Position.Top) {
case SettingsData.Position.Top:
offsets.top = Math.max(offsets.top, offset);
break;
case SettingsData.Position.Bottom:
offsets.bottom = Math.max(offsets.bottom, offset);
break;
case SettingsData.Position.Left:
offsets.left = Math.max(offsets.left, offset);
break;
case SettingsData.Position.Right:
offsets.right = Math.max(offsets.right, offset);
break;
}
}
return offsets;
} }
readonly property real dockThickness: { readonly property real dockThickness: {
@@ -163,28 +187,17 @@ PanelWindow {
const margin = Theme.spacingM; const margin = Theme.spacingM;
const centerX = (screenWidth - alignedWidth) / 2; const centerX = (screenWidth - alignedWidth) / 2;
const defaultBar = SettingsData.barConfigs[0] || SettingsData.getBarConfig("default");
const barPos = defaultBar?.position ?? SettingsData.Position.Top;
switch (SettingsData.osdPosition) { switch (SettingsData.osdPosition) {
case SettingsData.Position.Left: case SettingsData.Position.Left:
case SettingsData.Position.Bottom: case SettingsData.Position.Bottom:
const leftBarOffset = barPos === SettingsData.Position.Left ? barOffset : 0; case SettingsData.Position.LeftCenter:
const leftDockOffset = SettingsData.dockPosition === SettingsData.Position.Left ? dockOffset : 0; const leftDockOffset = SettingsData.dockPosition === SettingsData.Position.Left ? dockOffset : 0;
return Theme.snap(margin + Math.max(leftBarOffset, leftDockOffset), dpr); return Theme.snap(margin + Math.max(barEdgeOffsets.left, leftDockOffset), dpr);
case SettingsData.Position.Top: case SettingsData.Position.Top:
case SettingsData.Position.Right: case SettingsData.Position.Right:
const rightBarOffset = barPos === SettingsData.Position.Right ? barOffset : 0;
const rightDockOffset = SettingsData.dockPosition === SettingsData.Position.Right ? dockOffset : 0;
return Theme.snap(screenWidth - alignedWidth - margin - Math.max(rightBarOffset, rightDockOffset), dpr);
case SettingsData.Position.LeftCenter:
const leftCenterBarOffset = barPos === SettingsData.Position.Left ? barOffset : 0;
const leftCenterDockOffset = SettingsData.dockPosition === SettingsData.Position.Left ? dockOffset : 0;
return Theme.snap(margin + Math.max(leftCenterBarOffset, leftCenterDockOffset), dpr);
case SettingsData.Position.RightCenter: case SettingsData.Position.RightCenter:
const rightCenterBarOffset = barPos === SettingsData.Position.Right ? barOffset : 0; const rightDockOffset = SettingsData.dockPosition === SettingsData.Position.Right ? dockOffset : 0;
const rightCenterDockOffset = SettingsData.dockPosition === SettingsData.Position.Right ? dockOffset : 0; return Theme.snap(screenWidth - alignedWidth - margin - Math.max(barEdgeOffsets.right, rightDockOffset), dpr);
return Theme.snap(screenWidth - alignedWidth - margin - Math.max(rightCenterBarOffset, rightCenterDockOffset), dpr);
case SettingsData.Position.TopCenter: case SettingsData.Position.TopCenter:
case SettingsData.Position.BottomCenter: case SettingsData.Position.BottomCenter:
default: default:
@@ -196,22 +209,17 @@ PanelWindow {
const margin = Theme.spacingM; const margin = Theme.spacingM;
const centerY = (screenHeight - alignedHeight) / 2; const centerY = (screenHeight - alignedHeight) / 2;
const defaultBar = SettingsData.barConfigs[0] || SettingsData.getBarConfig("default");
const barPos = defaultBar?.position ?? SettingsData.Position.Top;
switch (SettingsData.osdPosition) { switch (SettingsData.osdPosition) {
case SettingsData.Position.Top: case SettingsData.Position.Top:
case SettingsData.Position.Left: case SettingsData.Position.Left:
case SettingsData.Position.TopCenter: case SettingsData.Position.TopCenter:
const topBarOffset = barPos === SettingsData.Position.Top ? barOffset : 0;
const topDockOffset = SettingsData.dockPosition === SettingsData.Position.Top ? dockOffset : 0; const topDockOffset = SettingsData.dockPosition === SettingsData.Position.Top ? dockOffset : 0;
return Theme.snap(margin + Math.max(topBarOffset, topDockOffset), dpr); return Theme.snap(margin + Math.max(barEdgeOffsets.top, topDockOffset), dpr);
case SettingsData.Position.Right: case SettingsData.Position.Right:
case SettingsData.Position.Bottom: case SettingsData.Position.Bottom:
case SettingsData.Position.BottomCenter: case SettingsData.Position.BottomCenter:
const bottomBarOffset = barPos === SettingsData.Position.Bottom ? barOffset : 0;
const bottomDockOffset = SettingsData.dockPosition === SettingsData.Position.Bottom ? dockOffset : 0; const bottomDockOffset = SettingsData.dockPosition === SettingsData.Position.Bottom ? dockOffset : 0;
return Theme.snap(screenHeight - alignedHeight - margin - Math.max(bottomBarOffset, bottomDockOffset), dpr); return Theme.snap(screenHeight - alignedHeight - margin - Math.max(barEdgeOffsets.bottom, bottomDockOffset), dpr);
case SettingsData.Position.LeftCenter: case SettingsData.Position.LeftCenter:
case SettingsData.Position.RightCenter: case SettingsData.Position.RightCenter:
default: default: