From 8ef1d95e6528f6daa0b9064cbba7ea748ef4792a Mon Sep 17 00:00:00 2001 From: bbedward Date: Tue, 31 Mar 2026 09:06:48 -0400 Subject: [PATCH] popout: fix inconsistent transparency --- quickshell/Modals/Common/DankModal.qml | 2 +- quickshell/Modals/DankColorPickerModal.qml | 2 +- quickshell/Widgets/DankOSD.qml | 4 ++-- quickshell/Widgets/DankPopout.qml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/quickshell/Modals/Common/DankModal.qml b/quickshell/Modals/Common/DankModal.qml index 4aa378e6..cafa1336 100644 --- a/quickshell/Modals/Common/DankModal.qml +++ b/quickshell/Modals/Common/DankModal.qml @@ -31,7 +31,7 @@ Item { property real animationOffset: Theme.spacingL property list animationEnterCurve: Theme.expressiveCurves.expressiveDefaultSpatial property list animationExitCurve: Theme.expressiveCurves.emphasized - property color backgroundColor: Theme.surfaceContainer + property color backgroundColor: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency) property color borderColor: Theme.outlineMedium property real borderWidth: 0 property real cornerRadius: Theme.cornerRadius diff --git a/quickshell/Modals/DankColorPickerModal.qml b/quickshell/Modals/DankColorPickerModal.qml index c81d82c7..8a33878b 100644 --- a/quickshell/Modals/DankColorPickerModal.qml +++ b/quickshell/Modals/DankColorPickerModal.qml @@ -132,7 +132,7 @@ DankModal { modalWidth: 680 modalHeight: contentLoader.item ? contentLoader.item.implicitHeight + Theme.spacingM * 2 : 680 - backgroundColor: Theme.surfaceContainer + backgroundColor: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency) cornerRadius: Theme.cornerRadius borderColor: Theme.outlineMedium borderWidth: 1 diff --git a/quickshell/Widgets/DankOSD.qml b/quickshell/Widgets/DankOSD.qml index e254094b..0eb0e5ad 100644 --- a/quickshell/Widgets/DankOSD.qml +++ b/quickshell/Widgets/DankOSD.qml @@ -266,7 +266,7 @@ PanelWindow { scale: shouldBeVisible ? 1 : 0.9 property bool childHovered: false - readonly property real popupSurfaceAlpha: SettingsData.popupTransparency + readonly property real popupSurfaceAlpha: Theme.popupTransparency Rectangle { id: background @@ -286,7 +286,7 @@ PanelWindow { level: Theme.elevationLevel3 fallbackOffset: 6 targetRadius: Theme.cornerRadius - targetColor: Theme.surfaceContainer + targetColor: Theme.withAlpha(Theme.surfaceContainer, osdContainer.popupSurfaceAlpha) borderColor: Theme.outlineMedium borderWidth: 1 shadowEnabled: Theme.elevationEnabled && SettingsData.popoutElevationEnabled && Quickshell.env("DMS_DISABLE_LAYER") !== "true" && Quickshell.env("DMS_DISABLE_LAYER") !== "1" diff --git a/quickshell/Widgets/DankPopout.qml b/quickshell/Widgets/DankPopout.qml index 9163a27c..fb476afb 100644 --- a/quickshell/Widgets/DankPopout.qml +++ b/quickshell/Widgets/DankPopout.qml @@ -579,7 +579,7 @@ Item { Rectangle { anchors.fill: parent radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency) + color: "transparent" border.color: BlurService.enabled ? BlurService.borderColor : Theme.outlineMedium border.width: BlurService.borderWidth }