Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-09 15:05:39 -05:00
Code Packages Releases Activity

Fix focused window

Browse Source
This commit is contained in:
bbedward
2025-07-21 20:52:58 -04:00
parent 4238bb4638
commit 42183b308e
1 changed files with 3 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Services/FocusedWindowService.qml
View File

@@ -21,13 +21,8 @@ Singleton {
return;
}
const focusedWindowId = NiriWorkspaceService.focusedWindowId;
if (!focusedWindowId) {
clearFocusedWindow();
return;
}
let focusedWindow = NiriWorkspaceService.windows.find(w => w.is_focused);
const focusedWindow = NiriWorkspaceService.windows.find(w => w.id === focusedWindowId);
if (focusedWindow) {
root.focusedAppId = focusedWindow.app_id || "";
root.focusedWindowTitle = focusedWindow.title || "";
@@ -38,10 +33,6 @@ Singleton {
}
}
function loadInitialFocusedWindow() {
if (root.niriAvailable)
focusedWindowQuery.running = true;
}
function clearFocusedWindow() {
root.focusedAppId = "";
@@ -89,11 +80,11 @@ Singleton {
NiriWorkspaceService.onNiriAvailableChanged.connect(() => {
root.niriAvailable = NiriWorkspaceService.niriAvailable;
if (root.niriAvailable)
loadInitialFocusedWindow();
updateFromNiriData();
});
if (root.niriAvailable)
loadInitialFocusedWindow();
updateFromNiriData();
}
@@ -103,9 +94,6 @@ Singleton {
updateFromNiriData();
}
function onFocusedWindowTitleChanged() {
root.focusedWindowTitle = NiriWorkspaceService.focusedWindowTitle;
}
function onWindowsChanged() {
updateFromNiriData();
@@ -123,31 +111,6 @@ Singleton {
target: NiriWorkspaceService
}
Process {
id: focusedWindowQuery
command: ["niri", "msg", "--json", "focused-window"]
running: false
stdout: StdioCollector {
onStreamFinished: {
if (text && text.trim()) {
try {
const windowData = JSON.parse(text.trim());
root.focusedAppId = windowData.app_id || "";
root.focusedWindowTitle = windowData.title || "";
root.focusedAppName = getDisplayName(windowData.app_id || "");
root.focusedWindowId = parseInt(windowData.id) || -1;
} catch (e) {
console.warn("FocusedWindowService: Failed to parse focused window data:", e);
clearFocusedWindow();
}
} else {
clearFocusedWindow();
}
}
}
}
}