Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-06-22 19:15:24 -04:00
Code Packages Releases Activity

theme/icons: add separate light/dark path, hot-reload, detect external

Browse Source 
DMS maangedand reset
fixes #608
closes #2674
This commit is contained in:
bbedward
2026-06-20 15:23:19 -04:00
parent 4203148cab
commit de91b78943
7 changed files with 417 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Common/Paths.qml
+22 -12
View File
@@ -74,6 +74,15 @@ Singleton {
return appId;
}
function themedIconPath(name: string): string {
if (!name)
return "";
const themed = (typeof IconThemeService !== "undefined") ? IconThemeService.resolve(name) : "";
if (themed)
return themed;
return Quickshell.iconPath(name, true);
}
function resolveIconPath(iconName: string): string {
if (!iconName)
return "";
@@ -83,23 +92,24 @@ Singleton {
return toFileUrl(expandTilde(moddedId));
if (moddedId.startsWith("file://"))
return moddedId;
return Quickshell.iconPath(moddedId, true);
return themedIconPath(moddedId);
}
return Quickshell.iconPath(iconName, true) || DesktopService.resolveIconPath(iconName);
return themedIconPath(iconName) || DesktopService.resolveIconPath(iconName);
}
function resolveIconUrl(iconName: string): string {
if (!iconName)
return "";
const moddedId = moddedAppId(iconName);
if (moddedId !== iconName) {
if (moddedId.startsWith("~") || moddedId.startsWith("/"))
return toFileUrl(expandTilde(moddedId));
if (moddedId.startsWith("file://"))
return moddedId;
return "image://icon/" + moddedId;
}
return "image://icon/" + iconName;
const target = (moddedId !== iconName) ? moddedId : iconName;
if (target.startsWith("~") || target.startsWith("/"))
return toFileUrl(expandTilde(target));
if (target.startsWith("file://"))
return target;
const themed = (typeof IconThemeService !== "undefined") ? IconThemeService.resolve(target) : "";
if (themed)
return themed;
return "image://icon/" + target;
}
function getAppIcon(appId: string, desktopEntry: var): string {
@@ -113,10 +123,10 @@ Singleton {
return resolveIconPath(appId);
if (desktopEntry && desktopEntry.icon) {
return Quickshell.iconPath(desktopEntry.icon, true);
return themedIconPath(desktopEntry.icon);
}
const icon = Quickshell.iconPath(appId, true);
const icon = themedIconPath(appId);
if (icon && icon !== "")
return icon;