Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-08-08 06:28:27 -04:00
Code Packages Releases Activity

theme: fix accent colors in light mode

Browse Source 
fixes #2711
This commit is contained in:
bbedward
2026-07-02 23:37:46 -04:00
parent a3ecef7627
commit d1eb655e46
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Common/Theme.qml
+8 -6
View File
@@ -1827,19 +1827,21 @@ Singleton {
const storedLight = isGreeterMode ? (GreetdSettings.registryThemeVariants[themeId]?.light || lightDefaults) : (typeof SettingsData !== "undefined" ? SettingsData.getRegistryThemeMultiVariant(themeId, lightDefaults, "light") : lightDefaults); const storedLight = isGreeterMode ? (GreetdSettings.registryThemeVariants[themeId]?.light || lightDefaults) : (typeof SettingsData !== "undefined" ? SettingsData.getRegistryThemeMultiVariant(themeId, lightDefaults, "light") : lightDefaults);
const darkFlavorId = storedDark.flavor || darkDefaults.flavor || ""; const darkFlavorId = storedDark.flavor || darkDefaults.flavor || "";
const lightFlavorId = storedLight.flavor || lightDefaults.flavor || ""; const lightFlavorId = storedLight.flavor || lightDefaults.flavor || "";
const accentId = storedDark.accent || darkDefaults.accent || ""; const darkAccentId = storedDark.accent || darkDefaults.accent || "";
const lightAccentId = storedLight.accent || lightDefaults.accent || "";
const darkFlavor = findVariant(customThemeRawData.variants.flavors, darkFlavorId); const darkFlavor = findVariant(customThemeRawData.variants.flavors, darkFlavorId);
const lightFlavor = findVariant(customThemeRawData.variants.flavors, lightFlavorId); const lightFlavor = findVariant(customThemeRawData.variants.flavors, lightFlavorId);
const accent = findAccent(customThemeRawData.variants.accents, accentId); const darkAccent = findAccent(customThemeRawData.variants.accents, darkAccentId);
const lightAccent = findAccent(customThemeRawData.variants.accents, lightAccentId);
if (darkFlavor) { if (darkFlavor) {
darkTheme = mergeColors(darkTheme, darkFlavor.dark || {}); darkTheme = mergeColors(darkTheme, darkFlavor.dark || {});
if (accent) if (darkAccent)
darkTheme = mergeColors(darkTheme, accent[darkFlavor.id] || {}); darkTheme = mergeColors(darkTheme, darkAccent[darkFlavor.id] || {});
} }
if (lightFlavor) { if (lightFlavor) {
lightTheme = mergeColors(lightTheme, lightFlavor.light || {}); lightTheme = mergeColors(lightTheme, lightFlavor.light || {});
if (accent) if (lightAccent)
lightTheme = mergeColors(lightTheme, accent[lightFlavor.id] || {}); lightTheme = mergeColors(lightTheme, lightAccent[lightFlavor.id] || {});
} }
} else if (customThemeRawData.variants.options) { } else if (customThemeRawData.variants.options) {
const isGreeterMode = typeof SessionData !== "undefined" && SessionData.isGreeterMode; const isGreeterMode = typeof SessionData !== "undefined" && SessionData.isGreeterMode;