From b192b5f7794f08f1dedc2d5987451cbbb09bcc53 Mon Sep 17 00:00:00 2001 From: bbedward Date: Mon, 11 May 2026 09:51:02 -0400 Subject: [PATCH] osd: fix positioning with multiple bars fixes #2387 --- quickshell/Widgets/DankOSD.qml | 84 +++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 38 deletions(-) diff --git a/quickshell/Widgets/DankOSD.qml b/quickshell/Widgets/DankOSD.qml index b8fcc258..dfd617a1 100644 --- a/quickshell/Widgets/DankOSD.qml +++ b/quickshell/Widgets/DankOSD.qml @@ -129,22 +129,46 @@ PanelWindow { readonly property bool isVerticalLayout: SettingsData.osdPosition === SettingsData.Position.LeftCenter || SettingsData.osdPosition === SettingsData.Position.RightCenter - readonly property real barThickness: { - const defaultBar = SettingsData.barConfigs[0] || SettingsData.getBarConfig("default"); - if (!defaultBar || !(defaultBar.visible ?? true)) - return 0; - const innerPadding = defaultBar.innerPadding ?? 4; - const widgetThickness = Math.max(20, 26 + innerPadding * 0.6); - return Math.max(widgetThickness + innerPadding + 4, Theme.barHeight - 4 - (8 - innerPadding)); - } - - readonly property real barOffset: { - const defaultBar = SettingsData.barConfigs[0] || SettingsData.getBarConfig("default"); - if (!defaultBar || !(defaultBar.visible ?? true)) - return 0; - const spacing = defaultBar.spacing ?? 4; - const bottomGap = defaultBar.bottomGap ?? 0; - return barThickness + spacing + bottomGap; + readonly property var barEdgeOffsets: { + const offsets = { + "top": 0, + "bottom": 0, + "left": 0, + "right": 0 + }; + const configs = SettingsData.barConfigs; + if (!screen || !configs) + return offsets; + const defaultBar = configs[0] || SettingsData.getBarConfig("default"); + for (var i = 0; i < configs.length; i++) { + const bc = configs[i]; + if (!bc || !(bc.enabled ?? true) || !(bc.visible ?? true)) + continue; + 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: { @@ -163,28 +187,17 @@ PanelWindow { const margin = Theme.spacingM; const centerX = (screenWidth - alignedWidth) / 2; - const defaultBar = SettingsData.barConfigs[0] || SettingsData.getBarConfig("default"); - const barPos = defaultBar?.position ?? SettingsData.Position.Top; - switch (SettingsData.osdPosition) { case SettingsData.Position.Left: 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; - 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.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: - const rightCenterBarOffset = barPos === SettingsData.Position.Right ? barOffset : 0; - const rightCenterDockOffset = SettingsData.dockPosition === SettingsData.Position.Right ? dockOffset : 0; - return Theme.snap(screenWidth - alignedWidth - margin - Math.max(rightCenterBarOffset, rightCenterDockOffset), dpr); + const rightDockOffset = SettingsData.dockPosition === SettingsData.Position.Right ? dockOffset : 0; + return Theme.snap(screenWidth - alignedWidth - margin - Math.max(barEdgeOffsets.right, rightDockOffset), dpr); case SettingsData.Position.TopCenter: case SettingsData.Position.BottomCenter: default: @@ -196,22 +209,17 @@ PanelWindow { const margin = Theme.spacingM; const centerY = (screenHeight - alignedHeight) / 2; - const defaultBar = SettingsData.barConfigs[0] || SettingsData.getBarConfig("default"); - const barPos = defaultBar?.position ?? SettingsData.Position.Top; - switch (SettingsData.osdPosition) { case SettingsData.Position.Top: case SettingsData.Position.Left: case SettingsData.Position.TopCenter: - const topBarOffset = barPos === SettingsData.Position.Top ? barOffset : 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.Bottom: case SettingsData.Position.BottomCenter: - const bottomBarOffset = barPos === SettingsData.Position.Bottom ? barOffset : 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.RightCenter: default: