Add back show window count option

Author: fredcw

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

@@ -1113,11 +1113,8 @@ class AppGroup {
         if (this.groupState.willUnmount) return;
 
         this.groupState.set({windowCount: this.groupState.metaWindows ? this.groupState.metaWindows.length : 0});
-        this.updateWindowsBadge();
-    }
-
-    updateWindowsBadge(){
-        if (this.groupState.windowCount > 1) {
+        
+        if (this.groupState.windowCount > 1 && this.state.settings.enableWindowCountBadges) {
             this.windowsBadgeLabel.text = this.groupState.windowCount.toString();
             this.windowsBadge.show();
         } else {

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

@@ -310,6 +310,7 @@ class GroupedWindowListApplet extends Applet.Applet {
             {key: 'super-num-hotkeys', value: 'SuperNumHotkeys', cb: this.bindAppKeys},
             {key: 'title-display', value: 'titleDisplay', cb: this.updateTitleDisplay},
             {key: 'launcher-animation-effect', value: 'launcherAnimationEffect', cb: null},
+            {key: 'enable-window-count-badges', value: 'enableWindowCountBadges', cb: this.onEnableWindowCountBadgeChange},
             {key: 'enable-notification-badges', value: 'enableNotificationBadges', cb: this.onEnableNotificationsChange},
             {key: 'enable-app-button-dragging', value: 'enableDragging', cb: this.draggableSettingChanged},
             {key: 'thumbnail-scroll-behavior', value: 'thumbnailScrollBehavior', cb: null},
@@ -592,6 +593,12 @@ class GroupedWindowListApplet extends Applet.Applet {
         });
     }
 
+    onEnableWindowCountBadgeChange() {
+        this.workspaces.forEach(
+            workspace => workspace.calcAllWindowNumbers()
+        );
+    }
+
     updateAttentionState(display, window) {
         this.workspaces.forEach(
             workspace => workspace.updateAttentionState(display, window)
@@ -1069,6 +1076,8 @@ class GroupedWindowListApplet extends Applet.Applet {
     }
 
     _onNotificationDestroyed(notification) {
+        if (!this.workspaces) return;
+        
         this.workspaces.forEach(workspace => {
             if (!workspace) return;
             workspace.appGroups.forEach(appGroup => {

files/usr/share/cinnamon/applets/[email protected]/settings-schema.json

@@ -50,6 +50,7 @@
       "keys": [
         "title-display",
         "launcher-animation-effect",
+        "enable-window-count-badges",
         "enable-notification-badges",
         "enable-app-button-dragging"
       ]
@@ -184,6 +185,12 @@
       "Scale": 3
     }
   },
+  "enable-window-count-badges": {
+    "type": "checkbox",
+    "default": true,
+    "description": "Show window count badges",
+    "tooltip": "Indicate on the panel the number of open windows an application has"
+  },
   "enable-notification-badges": {
     "type": "checkbox",
     "default": true,

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

@@ -333,7 +333,7 @@ class Workspace {
 
     calcAllWindowNumbers() {
         this.appGroups.forEach( appGroup => {
-            appGroup.calcWindowNumber(appGroup.groupState.metaWindows);
+            appGroup.calcWindowNumber();
         });
     }