gwl: track last focused window for case when groupApps is disabled

Signed-off-by: Milan Kotykov <[email protected]>

Author: m-cote

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

@@ -642,7 +642,11 @@ var AppGroup = class AppGroup {
         const {appId, metaWindows, lastFocused} = this.groupState;
 
         if (hasFocus === undefined) {
-            hasFocus = this.workspaceState.lastFocusedApp === appId;
+            if (this.state.settings.groupApps) {
+                hasFocus = this.workspaceState.lastFocusedApp === appId;
+            } else {
+                hasFocus = this.groupState.metaWindows.includes(this.workspaceState.lastFocusedWindow);
+            }
         }
 
         // If any of the windows associated with our app have focus,
@@ -977,7 +981,10 @@ var AppGroup = class AppGroup {
             this.updateNotificationsBadge();
             const hasFocus = getFocusState(metaWindow);
             if (hasFocus) {
-                this.workspaceState.set({lastFocusedApp: this.groupState.appId});
+                this.workspaceState.set({
+                    lastFocusedApp: this.groupState.appId,
+                    lastFocusedWindow: metaWindow
+                });
             }
             this.onFocusChange(hasFocus);
         }