diff --git a/Common/Theme.qml b/Common/Theme.qml index e01ad072..ab2d8635 100644 --- a/Common/Theme.qml +++ b/Common/Theme.qml @@ -717,8 +717,8 @@ Singleton { if (typeof SettingsData === "undefined") return "" const colorOverride = SettingsData.launcherLogoColorOverride if (!colorOverride || colorOverride === "") return "" - if (colorOverride === "primary") return Theme.primary - if (colorOverride === "surface") return Theme.surfaceText + if (colorOverride === "primary") return primary + if (colorOverride === "surface") return surfaceText return colorOverride } @@ -728,19 +728,18 @@ Singleton { const colorOverride = SettingsData.launcherLogoColorOverride if (!colorOverride || colorOverride === "") return "" - let baseColor = colorOverride - if (colorOverride === "primary") baseColor = Theme.primary - if (colorOverride === "surface") baseColor = Theme.surfaceText + if (colorOverride === "primary") return primary + if (colorOverride === "surface") return surfaceText if (!SettingsData.launcherLogoColorInvertOnMode) { - return baseColor + return colorOverride } - if (typeof SessionData !== "undefined" && SessionData.isLightMode) { - return invertHex(baseColor) + if (isLightMode) { + return invertHex(colorOverride) } - return baseColor + return colorOverride } diff --git a/Modules/DankBar/Widgets/LauncherButton.qml b/Modules/DankBar/Widgets/LauncherButton.qml index a9106501..e3351fb4 100644 --- a/Modules/DankBar/Widgets/LauncherButton.qml +++ b/Modules/DankBar/Widgets/LauncherButton.qml @@ -91,6 +91,7 @@ Item { } layer.enabled: Theme.effectiveLogoColor !== "" layer.effect: MultiEffect { + saturation: 0 colorization: 1 colorizationColor: Theme.effectiveLogoColor brightness: SettingsData.launcherLogoBrightness @@ -108,6 +109,7 @@ Item { source: SettingsData.launcherLogoCustomPath ? "file://" + SettingsData.launcherLogoCustomPath.replace("file://", "") : "" layer.enabled: Theme.effectiveLogoColor !== "" layer.effect: MultiEffect { + saturation: 0 colorization: 1 colorizationColor: Theme.effectiveLogoColor brightness: SettingsData.launcherLogoBrightness