diff --git a/quickshell/Common/Theme.qml b/quickshell/Common/Theme.qml index 03591376..c5eb2f49 100644 --- a/quickshell/Common/Theme.qml +++ b/quickshell/Common/Theme.qml @@ -634,6 +634,11 @@ Singleton { property real notepadTransparency: SettingsData.notepadTransparencyOverride >= 0 ? SettingsData.notepadTransparencyOverride : popupTransparency + property bool widgetBackgroundHasAlpha: { + const colorMode = typeof SettingsData !== "undefined" ? SettingsData.widgetBackgroundColor : "sch" + return colorMode === "sth" + } + property var widgetBaseBackgroundColor: { const colorMode = typeof SettingsData !== "undefined" ? SettingsData.widgetBackgroundColor : "sch" switch (colorMode) { diff --git a/quickshell/Modules/DankBar/Widgets/RunningApps.qml b/quickshell/Modules/DankBar/Widgets/RunningApps.qml index d477987c..ac1f8bd2 100644 --- a/quickshell/Modules/DankBar/Widgets/RunningApps.qml +++ b/quickshell/Modules/DankBar/Widgets/RunningApps.qml @@ -151,6 +151,9 @@ Item { } const baseColor = Theme.widgetBaseBackgroundColor + if (Theme.widgetBackgroundHasAlpha) { + return baseColor + } const transparency = (root.barConfig && root.barConfig.widgetTransparency !== undefined) ? root.barConfig.widgetTransparency : 1.0 return Theme.withAlpha(baseColor, transparency) } diff --git a/quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml b/quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml index 9165fced..b8097f87 100644 --- a/quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml +++ b/quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml @@ -88,6 +88,9 @@ Item { } const baseColor = Theme.widgetBaseBackgroundColor; + if (Theme.widgetBackgroundHasAlpha) { + return baseColor; + } const transparency = (root.barConfig && root.barConfig.widgetTransparency !== undefined) ? root.barConfig.widgetTransparency : 1.0; return Theme.withAlpha(baseColor, transparency); } diff --git a/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml b/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml index 02c93072..03ba9a41 100644 --- a/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml +++ b/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml @@ -532,6 +532,9 @@ Item { if ((barConfig?.noBackground ?? false)) return "transparent"; const baseColor = Theme.widgetBaseBackgroundColor; + if (Theme.widgetBackgroundHasAlpha) { + return baseColor; + } const transparency = (root.barConfig && root.barConfig.widgetTransparency !== undefined) ? root.barConfig.widgetTransparency : 1.0; return Theme.withAlpha(baseColor, transparency); } diff --git a/quickshell/Modules/Plugins/BasePill.qml b/quickshell/Modules/Plugins/BasePill.qml index c6c4febd..def8a644 100644 --- a/quickshell/Modules/Plugins/BasePill.qml +++ b/quickshell/Modules/Plugins/BasePill.qml @@ -51,6 +51,9 @@ Item { const isHovered = mouseArea.containsMouse || (root.isHovered || false); const baseColor = isHovered ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor; + if (Theme.widgetBackgroundHasAlpha) { + return baseColor; + } const transparency = (root.barConfig && root.barConfig.widgetTransparency !== undefined) ? root.barConfig.widgetTransparency : 1.0; return Theme.withAlpha(baseColor, transparency); }