gwl: Improve state handling during window removal

This fixes some annyoing issues during the removal of windows that would some time leave a ghost window instance in app groups. I've also improved the handled of some signals to ensure the window is only added again if it is inside a valid workspace and the workspace is similar to the current workspace receiving the signal.

Author: anaximeno

files/usr/share/cinnamon/applets/[email protected]/appGroup.js

@@ -61,6 +61,16 @@ const getFocusState = function(metaWindow) {
     return false;
 };
 
+const getLastFocusedWindow = function(metaWindows) {
+    let lastFocusedWindow = null;
+    for (let i = 0; i < metaWindows.length; i++) {
+        if (!lastFocusedWindow || (metaWindows[i].get_user_time() > lastFocusedWindow.get_user_time())) {
+            lastFocusedWindow = metaWindows[i];
+        }
+    }
+    return lastFocusedWindow;
+};
+
 var AppGroup = class AppGroup {
     constructor(params) {
         this.state = params.state;
@@ -992,19 +1002,21 @@ var AppGroup = class AppGroup {
         this.signals.disconnect('notify::icon', metaWindow);
         this.signals.disconnect('notify::progress', metaWindow);
 
-        this.groupState.metaWindows.splice(refWindow, 1);
+        const metaWindows = this.groupState.metaWindows.filter((w) => w != metaWindow);        
 
         if (this.progressOverlay.visible) this.onProgressChange();
 
-        if (this.groupState.metaWindows.length > 0 && !this.groupState.willUnmount) {
-            this.onWindowTitleChanged(this.groupState.lastFocused);
-            this.groupState.set({
-                metaWindows: this.groupState.metaWindows,
-                lastFocused: this.groupState.metaWindows[this.groupState.metaWindows.length - 1]
-            }, true);
+        if (!this.groupState.willUnmount) {
+            const lastFocused = this.groupState.lastFocused === metaWindow
+                ? getLastFocusedWindow(metaWindows)
+                : this.groupState.lastFocused;
+            this.groupState.set({metaWindows: metaWindows, lastFocused: lastFocused}, true);
+            this.onWindowTitleChanged(lastFocused);
             if (this.hoverMenu) this.groupState.trigger('removeThumbnailFromMenu', metaWindow);
             this.calcWindowNumber();
-        } else {
+        }
+
+        if (metaWindows.length === 0) {
             // This is the last window, so this group needs to be destroyed. We'll call back windowRemoved
             // in workspace to put the final nail in the coffin.
             if (typeof cb === 'function') {
@@ -1125,10 +1137,12 @@ var AppGroup = class AppGroup {
     calcWindowNumber() {
         if (this.groupState.willUnmount) return;
 
-        this.groupState.set({windowCount: this.groupState.metaWindows ? this.groupState.metaWindows.length : 0});
-        
-        if (this.groupState.windowCount > 1 && this.state.settings.enableWindowCountBadges) {
-            this.windowsBadgeLabel.text = this.groupState.windowCount.toString();
+        const windowCount = this.groupState.metaWindows ? this.groupState.metaWindows.length : 0;
+
+        this.groupState.set({windowCount: windowCount});
+
+        if (windowCount > 1 && this.state.settings.enableWindowCountBadges) {
+            this.windowsBadgeLabel.text = windowCount.toString();
             this.windowsBadge.show();
         } else {
             this.windowsBadge.hide();

files/usr/share/cinnamon/applets/[email protected]/applet.js

@@ -448,12 +448,16 @@ class GroupedWindowListApplet extends Applet.Applet {
         return false;
     }
 
-    onWindowMonitorChanged(display, metaWindow, metaWorkspace) {
-        if (this.state.monitorWatchList.length !== this.numberOfMonitors) {
-            const currentWorkspace = this.getCurrentWorkspace();
-            if (currentWorkspace !== null) {
-                currentWorkspace.windowRemoved(metaWorkspace, metaWindow);
-                currentWorkspace.windowAdded(metaWorkspace, metaWindow);
+    onWindowMonitorChanged(display, metaWindow, monitor) {
+        const metaWorkspace = metaWindow.get_workspace();
+        if ((this.state.monitorWatchList.length !== this.numberOfMonitors) && metaWorkspace) {
+            const windowWorkspace = this.workspaces.find(
+                workspace => workspace.metaWorkspace && workspace.metaWorkspace.index() === metaWorkspace.index()
+            );
+
+            if (windowWorkspace !== null) {
+                windowWorkspace.windowRemoved(metaWorkspace, metaWindow);
+                windowWorkspace.windowAdded(metaWorkspace, metaWindow);
             }
         }
     }
@@ -769,7 +773,7 @@ class GroupedWindowListApplet extends Applet.Applet {
             currentWorkspace.appGroups[z].groupState.lastFocused
                 : source.groupState.metaWindows[z];
             Main.activateWindow(_window, global.get_current_time());
-            setTimeout(() => this.state.set({scrollActive: false}, 4000));
+            setTimeout(() => this.state.set({scrollActive: false}), 4000);
         }
     }
 
@@ -1018,10 +1022,14 @@ class GroupedWindowListApplet extends Applet.Applet {
     _onWindowAppChanged(tracker, metaWindow) {
         if (!metaWindow) return;
 
+        const windowWorkspace = metaWindow.get_workspace();
+
         this.workspaces.forEach(workspace => {
             if (!workspace) return;
-            workspace.windowRemoved(workspace.metaWorkspace, metaWindow);
-            workspace.windowAdded(workspace.metaWorkspace, metaWindow);
+            if (windowWorkspace && (workspace.metaWorkspace.index() === windowWorkspace.index())) {
+                workspace.windowRemoved(workspace.metaWorkspace, metaWindow);
+                workspace.windowAdded(workspace.metaWorkspace, metaWindow);
+            }
         });
     }
 

files/usr/share/cinnamon/applets/[email protected]/workspace.js

@@ -243,7 +243,11 @@ var Workspace = class Workspace {
     windowWorkspaceChanged(display, metaWindow, metaWorkspace) {
         // If the window is removed the metaWorkspace will be null, in that
         // case we wouldn't want to add the window again.
-        if (metaWorkspace) this.windowAdded(metaWorkspace, metaWindow);
+        if (metaWorkspace && this.metaWorkspace.index() === metaWorkspace.index()) {
+            this.windowAdded(metaWorkspace, metaWindow);
+        } else {
+            this.windowRemoved(metaWorkspace, metaWindow);
+        }
     }
 
     windowAdded(metaWorkspace, metaWindow, app, isFavoriteApp) {
@@ -356,10 +360,9 @@ var Workspace = class Workspace {
 
         // Abort the remove if the window is just changing workspaces, window
         // should always remain indexed on all workspaces while its mapped.
-        // if (!metaWindow.showing_on_its_workspace()) return;
-        if ((this.state.settings.showAllWorkspaces) && (metaWindow.has_focus()
-            && global.workspace_manager.get_active_workspace_index()
-            !== metaWorkspace.index())) return;
+        if (this.state.settings.showAllWorkspaces && !this.state.removingWindowFromWorkspaces &&
+            metaWindow.has_focus() && (global.workspace_manager.get_active_workspace_index() !== metaWorkspace.index()))
+            return;
 
         // If the window is on all workspaces or we're showing windows in all workspaces,
         // make sure to remove the window from all workspaces.
@@ -396,7 +399,7 @@ var Workspace = class Workspace {
 
                         const refAppId = this.appGroups[refApp].groupState.appId;
 
-                        this.appGroups[refApp].destroy(true);
+                        this.appGroups[refApp].destroy();
                         this.appGroups[refApp] = undefined;
                         this.appGroups.splice(refApp, 1);
 
@@ -416,7 +419,7 @@ var Workspace = class Workspace {
                         }
                     }
                 } else {
-                    this.appGroups[refApp].destroy(true);
+                    this.appGroups[refApp].destroy();
                     this.appGroups[refApp] = undefined;
                     this.appGroups.splice(refApp, 1);
                 }