refactor

Author: fredcw

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

@@ -99,6 +99,7 @@ class AppGroup {
         this.labelVisiblePref = this.state.settings.titleDisplay !== TitleDisplay.None && this.state.isHorizontal;
         this.drawLabel = this.labelVisiblePref;
         this.progress = 0;
+        this.notifications = [];
 
         this.actor =  new Cinnamon.GenericContainer({
             name: 'appButton',
@@ -191,7 +192,7 @@ class AppGroup {
         this.calcWindowNumber();
         this.on_orientation_changed(true);
         this.handleFavorite();
-        this.state.notifications.addAppGroup(this);
+        this.state.trigger('copyNotifications', this);
     }
 
     initThumbnailMenu() {
@@ -953,7 +954,7 @@ class AppGroup {
             this.setIcon(metaWindow)
 
             this.calcWindowNumber();
-            this.state.notifications.updateNotificationsBadge(this);
+            this.updateNotificationsBadge();
             this.onFocusChange();
         }
         set({
@@ -1124,6 +1125,15 @@ class AppGroup {
         }
     }
 
+    updateNotificationsBadge() {
+        if (this.notifications.length > 0) {
+            this.notificationsBadgeLabel.text = this.notifications.length.toString();
+            this.notificationsBadge.show();
+        } else {
+            this.notificationsBadge.hide();
+        }
+    }
+
     handleTitleDisplayChange() {
         this.groupState.metaWindows.forEach(
             win => this.onWindowTitleChanged(win, true)

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

@@ -162,83 +162,6 @@ class PinnedFavs {
     }
 }
 
-class Notifications {
-    // As an app can have multiple appgroups (multiple windows, different workspaces, multiple instances), all
-    // appGroups with the same appId should always display the same number of notifications.
-    constructor() {
-        this._appGroupList = []; //stores all appGroups from all workspaces
-        Main.messageTray.connect('notify-applet-update', (mtray, notification) => this._notificationReceived(mtray, notification));
-    }
-
-    _notificationReceived(mtray, notification) {
-        let appId = notification.source.app?.get_id();
-      
-        if (!appId) {
-            return;
-        }
-
-        // Add notification to all appgroups with appId
-        let notificationAdded = false;
-        this._appGroupList.forEach(appGroup => {
-            if (!appGroup.groupState || appGroup.groupState.willUnmount) return;
-            if (appId === appGroup.groupState.appId) {
-                appGroup.notifications.push(notification);
-                notificationAdded = true;
-                this.updateNotificationsBadge(appGroup);
-            }
-        });
-        if (notificationAdded) {
-            notification.appId = appId;
-            notification.connect('destroy',  () => this._removeNotification(notification));
-        }
-    }
-
-    _removeNotification(notification) {
-        this._appGroupList.forEach(appGroup => {
-            if (!appGroup.groupState || appGroup.groupState.willUnmount) return;
-            if (notification.appId === appGroup.groupState.appId) {
-                const index = appGroup.notifications.indexOf(notification);
-                if (index > -1) {
-                    appGroup.notifications.splice(index, 1)
-                    this.updateNotificationsBadge(appGroup);
-                }
-            }
-        });
-    }
-
-    updateNotificationsBadge(appGroup) {
-        if (appGroup.notifications.length > 0) {
-            appGroup.notificationsBadgeLabel.text = appGroup.notifications.length.toString();
-            appGroup.notificationsBadge.show();
-        } else {
-            appGroup.notificationsBadge.hide();
-        }
-    }
-
-    // Called from AppGroup constructor so that we always have a list of all appgroups from all workspaces.
-    addAppGroup(newAppGroup) {
-        newAppGroup.notifications = [];
-
-        //Copy notifications from any existing appGroup with the same appId.
-        this._appGroupList.some(appGroup => {
-            if (!appGroup.groupState || appGroup.groupState.willUnmount) return false;
-            if (appGroup.groupState.appId === newAppGroup.groupState.appId) {
-                newAppGroup.notifications = appGroup.notifications.slice(); //shallow copy
-                return true;
-            }
-        })
-
-        this._appGroupList.push(newAppGroup);
-
-        //remove old deleted appgroups
-        this._appGroupList = this._appGroupList.filter(appGroup =>
-            appGroup !== null &&
-            appGroup !== undefined &&
-            appGroup.groupState &&
-            !appGroup.groupState.willUnmount);
-    }
-}
-
 class GroupedWindowListApplet extends Applet.Applet {
     constructor(metadata, orientation, panel_height, instance_id) {
         super(orientation, panel_height, instance_id);
@@ -269,7 +192,6 @@ class GroupedWindowListApplet extends Applet.Applet {
             appletReady: false,
             willUnmount: false,
             settings: {},
-            notifications: new Notifications(),
             homeDir: GLib.get_home_dir(),
             lastOverlayPreview: null,
             lastCycled: -1,
@@ -334,6 +256,7 @@ class GroupedWindowListApplet extends Applet.Applet {
             openAbout: () => this.openAbout(),
             configureApplet: () => this.configureApplet(),
             removeApplet: (event) => this.confirmRemoveApplet(event),
+            copyNotifications: (appGroup) => this.copyNotifications(appGroup)
         });
 
         this.settings = new AppletSettings(this.state.settings, metadata.uuid, instance_id);
@@ -370,6 +293,7 @@ class GroupedWindowListApplet extends Applet.Applet {
         this.signals.connect(global.display, 'window-created', (...args) => this.onWindowCreated(...args));
         this.signals.connect(global.settings, 'changed::panel-edit-mode', (...args) => this.on_panel_edit_mode_changed(...args));
         this.signals.connect(Main.themeManager, 'theme-set', (...args) => this.refreshCurrentWorkspace(...args));
+        this.signals.connect(Main.messageTray, 'notify-applet-update', this._onNotificationReceived.bind(this));
     }
 
     bindSettings() {
@@ -504,6 +428,9 @@ class GroupedWindowListApplet extends Applet.Applet {
         this.settings.finalize();
         unref(this, RESERVE_KEYS);
         MessageTray.extensionsHandlingNotifications--;
+        if (MessageTray.extensionsHandlingNotifications === 0) {
+            this._destroyAllNotifications();
+        }
     }
 
     on_panel_icon_size_changed(iconSize) {
@@ -1096,6 +1023,78 @@ class GroupedWindowListApplet extends Applet.Applet {
         this.state.set({thumbnailCloseButtonOffset: global.ui_scale > 1 ? -10 : 0});
         this.refreshAllWorkspaces();
     }
+
+    copyNotifications(newAppGroup) {
+        // Copy notifications from any existing appGroup with the same appId.
+        this.workspaces.some(workspace => {
+            if (!workspace) return false;
+            return workspace.appGroups.some(appGroup => {
+                if (!appGroup || !appGroup.groupState || appGroup.groupState.willUnmount) return false;
+                if (appGroup.groupState.appId === newAppGroup.groupState.appId) {
+                    newAppGroup.notifications = appGroup.notifications.slice(); // Shallow copy.
+                    return true;
+                }
+                return false;
+            });
+        });
+    }
+
+     _onNotificationReceived(mtray, notification) {
+        let appId = notification.source.app?.get_id();
+      
+        if (!appId) {
+            return;
+        }
+
+        // Add notification to all appgroups with appId.
+        let notificationAdded = false;
+
+        this.workspaces.forEach(workspace => {
+            if (!workspace) return;
+            workspace.appGroups.forEach(appGroup => {
+                if (!appGroup || !appGroup.groupState || appGroup.groupState.willUnmount) return;
+                if (appId === appGroup.groupState.appId) {
+                    appGroup.notifications.push(notification);
+                    notificationAdded = true;
+                    appGroup.updateNotificationsBadge();
+                }
+            });
+        });
+
+        if (notificationAdded) {
+            notification.appId = appId;
+            notification.connect('destroy',  () => this._onNotificationDestroyed(notification));
+        }
+    }
+
+    _onNotificationDestroyed(notification) {
+        this.workspaces.forEach(workspace => {
+            if (!workspace) return;
+            workspace.appGroups.forEach(appGroup => {
+                if (!appGroup || !appGroup.groupState || appGroup.groupState.willUnmount) return;
+                if (notification.appId === appGroup.groupState.appId) {
+                    const index = appGroup.notifications.indexOf(notification);
+                    if (index > -1) {
+                        appGroup.notifications.splice(index, 1)
+                        appGroup.updateNotificationsBadge();
+                    }
+                }
+            });
+        });
+    }
+
+    _destroyAllNotifications() {
+        this.workspaces.forEach(workspace => {
+            if (!workspace) return;
+            workspace.appGroups.forEach(appGroup => {
+                if (!appGroup || !appGroup.groupState || appGroup.groupState.willUnmount) return;
+                // Iterate backwards due to in place element deletion.
+                for (let i = appGroup.notifications.length - 1; i >= 0; i--) {
+                    appGroup.notifications[i].destroy();
+                }
+            });
+        });
+    }
 }
 
 function main(metadata, orientation, panel_height, instance_id) {