1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-08-07 22:18:30 -04:00

theme: stop overwriting user gtk.css and dconf gtk-theme (#2933)

This commit is contained in:
bbedward
2026-07-26 14:48:23 -04:00
parent eed3617a0d
commit 564583951c
3 changed files with 166 additions and 61 deletions
+9 -5
View File
@@ -144,7 +144,7 @@ Singleton {
Quickshell.execDetached(["mkdir", "-p", stateDir]);
// shellDir may be an embedded-UI extraction, which is read-only and
// unexecutable (dankgo shellapp/shellfs makeReadOnly chmods 0444)
Quickshell.execDetached(["bash", shellDir + "/scripts/gtk.sh", configDir, "", "", shellDir]);
Quickshell.execDetached(["bash", shellDir + "/scripts/gtk.sh", configDir, "assets", "", shellDir]);
Proc.runCommand("matugenCheck", ["sh", "-c", "command -v matugen"], (output, code) => {
matugenAvailable = (code === 0) && !envDisableMatugen;
@@ -1955,7 +1955,13 @@ Singleton {
function patchGtk3colors() {
const isLight = (typeof SessionData !== "undefined" && SessionData.isLightMode);
Proc.runCommand("gtk3Patcher", ["bash", shellDir + "/scripts/gtk.sh", configDir, "patch", isLight, shellDir], (output, exitCode) => {
if (exitCode !== 0) {
switch (exitCode) {
case 0:
refreshGtkTheme();
break;
case 2:
break;
default:
log.warn(`Failed to patch GTK3 colors: ${output}`);
}
});
@@ -2167,10 +2173,8 @@ Singleton {
}
if (!pendingThemeRequest) {
if (SettingsData.matugenTemplateGtk) {
if (SettingsData.matugenTemplateGtk)
patchGtk3colors();
refreshGtkTheme();
}
return;
}