gwl: Let workspace.windowAdded arbitrate over if metaWindow should be added to the workspace

This already checks if window is in correct workspace and/or windows should be shown in all workspaces, plus checking the monitor using the shouldWindowBeAdded method.

Author: anaximeno

files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/appGroup.js

@@ -64,8 +64,9 @@ const getFocusState = function(metaWindow) {
 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];
+        const metaWindow = metaWindows[i];
+        if (!lastFocusedWindow || (metaWindow.get_user_time() > lastFocusedWindow.get_user_time())) {
+            lastFocusedWindow = metaWindow;
         }
     }
     return lastFocusedWindow;
@@ -1019,11 +1020,6 @@ var AppGroup = class AppGroup {
         this.calcWindowNumber();
 
         if ((metaWindows.length === 0 || this.groupState.willUnmount) && typeof cb === 'function') {
-            // 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 (this.hoverMenu && this.groupState.isFavoriteApp) {
-                this.groupState.trigger('removeThumbnailFromMenu', metaWindow);
-            }
             cb(this.groupState.appId, this.groupState.isFavoriteApp);
         }
     }

files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/applet.js

@@ -449,16 +449,12 @@ class GroupedWindowListApplet extends Applet.Applet {
     }
 
     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);
-            }
+        if ((this.state.monitorWatchList.length !== this.numberOfMonitors)) {
+            this.workspaces.forEach( workspace => {
+                if (!workspace) return;
+                workspace.windowRemoved(workspace.metaWorkspace, metaWindow);
+                workspace.windowAdded(workspace.metaWorkspace, metaWindow);
+            });
         }
     }
 
@@ -1021,15 +1017,10 @@ class GroupedWindowListApplet extends Applet.Applet {
 
     _onWindowAppChanged(tracker, metaWindow) {
         if (!metaWindow) return;
-
-        const windowWorkspace = metaWindow.get_workspace();
-
         this.workspaces.forEach(workspace => {
             if (!workspace) return;
-            if (windowWorkspace && (workspace.metaWorkspace.index() === windowWorkspace.index())) {
-                workspace.windowRemoved(workspace.metaWorkspace, metaWindow);
-                workspace.windowAdded(workspace.metaWorkspace, metaWindow);
-            }
+            workspace.windowRemoved(workspace.metaWorkspace, metaWindow);
+            workspace.windowAdded(workspace.metaWorkspace, metaWindow);
         });
     }
 
@@ -1040,7 +1031,7 @@ class GroupedWindowListApplet extends Applet.Applet {
 
      _onNotificationReceived(mtray, notification) {
         let appId = notification.source.app?.get_id();
-      
+
         if (!appId) {
             return;
         }

files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/workspace.js

@@ -234,16 +234,15 @@ var Workspace = class Workspace {
 
     shouldWindowBeAdded(metaWindow) {
         return (this.state.settings.showAllWorkspaces
-            || metaWindow.is_on_all_workspaces()
-            || metaWindow.get_workspace() === this.metaWorkspace)
+                || metaWindow.is_on_all_workspaces()
+                || (metaWindow.get_workspace().index() === this.metaWorkspace.index()))
         && Main.isInteresting(metaWindow)
         && this.state.monitorWatchList.indexOf(metaWindow.get_monitor()) > -1;
     }
 
     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.metaWorkspace.index() === metaWorkspace.index()) {
+        // If the window is removed the metaWorkspace will be null.
+        if (metaWorkspace) {
             this.windowAdded(metaWorkspace, metaWindow);
         } else {
             this.windowRemoved(metaWorkspace, metaWindow);