Salastil/DankMaterialShell
1
0 Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-10-27 13:37:48 -04:00
Code Packages Releases Activity

niri: fix workspace updates never applying

Browse Source 
fixes #3462
port 1.6
This commit is contained in:
bbedward committed 2026-09-17 09:50:44 -04:00
1 parent 49a639a358
commit 36bb62ac66
1 file changed
+24 -42
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Services/NiriService.qml
+24 -42
View File
@@ -67,6 +67,17 @@ Singleton {
root.allWorkspaces = Object.values(newMap).sort((a, b) => a.idx - b.idx);
}
function updateWorkspace(workspaceId, changes) {
const ws = root.workspaces[workspaceId];
if (!ws)
return;
if (Object.keys(changes).every(key => ws[key] === changes[key]))
return;
const updatedWorkspaces = Object.assign({}, root.workspaces);
updatedWorkspaces[workspaceId] = Object.assign({}, ws, changes);
setWorkspaces(updatedWorkspaces);
}
function validate() {
validateProcess.running = true;
}
@@ -524,40 +535,20 @@ Singleton {
if (changed)
windows = updatedWindows;
if (focusedWindow) {
const ws = root.workspaces[focusedWindow.workspace_id];
if (ws && ws.active_window_id !== focusedWindowId) {
const updatedWs = {};
for (let prop in ws) {
updatedWs[prop] = ws[prop];
}
updatedWs.active_window_id = focusedWindowId;
const updatedWorkspaces = {};
for (const id in root.workspaces) {
updatedWorkspaces[id] = id === focusedWindow.workspace_id ? updatedWs : root.workspaces[id];
}
setWorkspaces(updatedWorkspaces);
}
}
if (!focusedWindow)
return;
updateWorkspace(focusedWindow.workspace_id, {
"active_window_id": focusedWindowId
});
}
function handleWorkspaceActiveWindowChanged(data) {
const ws = root.workspaces[data.workspace_id];
if (ws) {
const updatedWs = {};
for (let prop in ws) {
updatedWs[prop] = ws[prop];
}
updatedWs.active_window_id = data.active_window_id;
if (root.workspaces[data.workspace_id]) {
if (data.active_window_id !== null && data.active_window_id !== undefined)
lastFocusedWindowId = data.active_window_id;
const updatedWorkspaces = {};
for (const id in root.workspaces) {
updatedWorkspaces[id] = id === data.workspace_id ? updatedWs : root.workspaces[id];
}
setWorkspaces(updatedWorkspaces);
updateWorkspace(data.workspace_id, {
"active_window_id": data.active_window_id
});
}
let changed = false;
@@ -694,20 +685,11 @@ Singleton {
}
function handleWorkspaceUrgencyChanged(data) {
const ws = root.workspaces[data.id];
if (!ws)
if (!root.workspaces[data.id])
return;
const updatedWs = {};
for (let prop in ws) {
updatedWs[prop] = ws[prop];
}
updatedWs.is_urgent = data.urgent;
const updatedWorkspaces = {};
for (const id in root.workspaces) {
updatedWorkspaces[id] = id === data.id ? updatedWs : root.workspaces[id];
}
setWorkspaces(updatedWorkspaces);
updateWorkspace(data.id, {
"is_urgent": data.urgent
});
windowUrgentChanged();
}