lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(workspace): copy window to js object instead of holding live listmodel prox.

Browse Source
This commit is contained in:
Lemmy
2026-04-01 20:30:22 -04:00
parent 8815a0da27
commit 4ee55c2a99
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Bar/Widgets/Workspace.qml
+12 -14
View File
@@ -779,9 +779,7 @@ Item {
delegate: Item {
id: groupedTaskbarItem
// liveWindows is reassigned on scroll/focus; delegates can outlive rows and see null modelData
readonly property bool winOk: modelData !== undefined && modelData !== null
readonly property bool isFocused: winOk && modelData.isFocused
readonly property bool isFocused: modelData?.isFocused ?? false
width: root.iconSize
height: root.iconSize
@@ -798,7 +796,7 @@ Item {
source: {
root.iconRevision; // Force re-evaluation when revision changes
return ThemeIcons.iconForAppId(modelData.appId?.toLowerCase());
return ThemeIcons.iconForAppId(modelData?.appId?.toLowerCase());
}
smooth: true
asynchronous: true
@@ -832,13 +830,13 @@ Item {
preventStealing: true
onPressed: mouse => {
if (mouse.button === Qt.LeftButton && groupedTaskbarItem.winOk) {
if (mouse.button === Qt.LeftButton && modelData) {
CompositorService.focusWindow(modelData);
}
}
onReleased: mouse => {
if (mouse.button === Qt.RightButton && groupedTaskbarItem.winOk) {
if (mouse.button === Qt.RightButton && modelData) {
mouse.accepted = true;
TooltipService.hide();
root.selectedWindowId = modelData.id || modelData.address || "";
@@ -846,14 +844,14 @@ Item {
openGroupedContextMenu(groupedTaskbarItem);
}
}
// onEntered: {
// if (!groupedTaskbarItem.winOk)
// return;
// TooltipService.show(groupedTaskbarItem, modelData.title || modelData.appId || "Unknown app.", BarService.getTooltipDirection(root.screenName));
// }
// onExited: {
// TooltipService.hide();
// }
onEntered: {
if (!modelData)
return;
TooltipService.show(groupedTaskbarItem, modelData.title || modelData.appId || "Unknown app.", BarService.getTooltipDirection(root.screenName));
}
onExited: {
TooltipService.hide();
}
}
}
}
Services/Compositor/CompositorService.qml
+11 -1
View File
@@ -373,7 +373,17 @@ Singleton {
for (var i = 0; i < windows.count; i++) {
var window = windows.get(i);
if (window.workspaceId === workspaceId) {
windowsInWs.push(window);
// Snapshot to plain JS object so callers never hold live ListModel
// proxies that become invalid when syncWindows() clears the model.
windowsInWs.push({
id: window.id,
title: window.title,
appId: window.appId,
isFocused: window.isFocused,
workspaceId: window.workspaceId,
address: window.address,
output: window.output
});
}
}
return windowsInWs;