1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-04-14 01:32:29 -04:00

focused app: fallback to app name if no title in compact mode fixes #2005

This commit is contained in:
bbedward
2026-03-16 11:37:15 -04:00
parent 6c1fff2df1
commit e633c9e039

View File

@@ -87,11 +87,11 @@ BasePill {
} }
const workspaceWindows = NiriService.windows.filter(w => w.workspace_id === currentWorkspaceId); const workspaceWindows = NiriService.windows.filter(w => w.workspace_id === currentWorkspaceId);
return workspaceWindows.length > 0 && activeWindow && activeWindow.title; return workspaceWindows.length > 0 && activeWindow && (activeWindow.title || activeWindow.appId);
} }
if (CompositorService.isHyprland) { if (CompositorService.isHyprland) {
if (!Hyprland.focusedWorkspace || !activeWindow || !activeWindow.title) { if (!Hyprland.focusedWorkspace || !activeWindow || !(activeWindow.title || activeWindow.appId)) {
return false; return false;
} }
@@ -111,7 +111,7 @@ BasePill {
} }
} }
return activeWindow && activeWindow.title; return activeWindow && (activeWindow.title || activeWindow.appId);
} }
width: hasWindowsOnCurrentWorkspace ? (isVerticalOrientation ? barThickness : visualWidth) : 0 width: hasWindowsOnCurrentWorkspace ? (isVerticalOrientation ? barThickness : visualWidth) : 0
@@ -211,17 +211,20 @@ BasePill {
text: { text: {
const title = activeWindow && activeWindow.title ? activeWindow.title : ""; const title = activeWindow && activeWindow.title ? activeWindow.title : "";
const appName = appText.text; const appName = appText.text;
if (!title || !appName) {
if (compactMode) {
if (!title || title === appName)
return title || appName;
if (title.endsWith(appName))
return title.substring(0, title.length - appName.length).replace(/ (-|—) $/, "") || appName;
return title; return title;
} }
if (title.endsWith(" - " + appName)) { if (!title || !appName)
return title.substring(0, title.length - (" - " + appName).length); return title;
}
if (title.endsWith(appName)) { if (title.endsWith(appName))
return title.substring(0, title.length - appName.length).replace(/ - $/, ""); return title.substring(0, title.length - appName.length).replace(/ (-|—) $/, "");
}
return title; return title;
} }