Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-24 21:42:51 -05:00
Code Packages Releases Activity

themes: dont handle custom themes in onCompleted

Browse Source 
- Defer entirley to FileView
This commit is contained in:
bbedward
2025-12-08 23:44:04 -05:00
parent 858c6407a9
commit c4aea6d326
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/internal/distros/debian.go
View File

@@ -506,7 +506,7 @@ func (d *DebianDistribution) installAPTPackages(ctx context.Context, packages []
d.log(fmt.Sprintf("Installing APT packages: %s", strings.Join(packages, ", "))) d.log(fmt.Sprintf("Installing APT packages: %s", strings.Join(packages, ", ")))
args := []string{"apt-get", "install", "-y"} args := []string{"DEBIAN_FRONTEND=noninteractive", "apt-get", "install", "-y"}
args = append(args, packages...) args = append(args, packages...)
progressChan <- InstallProgressMsg{ progressChan <- InstallProgressMsg{

22
quickshell/Common/Theme.qml
View File

@@ -128,21 +128,13 @@ Singleton {
setDesiredTheme("image", rawWallpaperPath, isLight, iconTheme, selectedMatugenType); setDesiredTheme("image", rawWallpaperPath, isLight, iconTheme, selectedMatugenType);
} }
} }
} else { } else if (currentTheme !== "custom") {
let primaryColor; const darkTheme = StockThemes.getThemeByName(currentTheme, false);
let matugenType; const lightTheme = StockThemes.getThemeByName(currentTheme, true);
if (currentTheme === "custom") { if (darkTheme && darkTheme.primary) {
if (customThemeData && customThemeData.primary) { const stockColors = buildMatugenColorsFromTheme(darkTheme, lightTheme);
primaryColor = customThemeData.primary; const themeData = isLight ? lightTheme : darkTheme;
matugenType = customThemeData.matugen_type; setDesiredTheme("hex", themeData.primary, isLight, iconTheme, themeData.matugen_type, stockColors);
}
} else {
primaryColor = currentThemeData.primary;
matugenType = currentThemeData.matugen_type;
}
if (primaryColor) {
setDesiredTheme("hex", primaryColor, isLight, iconTheme, matugenType);
} }
} }
}, 0); }, 0);