Merge pull request #303 from mzur/backport-v10

Backport v10

Author: mzur

[email protected]/workspacePopup/workspaceManagerOverride.js

@@ -467,7 +467,15 @@ export default class WorkspaceManagerOverride {
                 });
 
                 let event = Clutter.get_current_event();
-                let modifiers = event ? event.get_state() & Clutter.ModifierType.MODIFIER_MASK : 0;
+                // gnome-shell's SwitcherPopup.show() seems to expect a modifier
+                // mask from a configured keybinding, not from an event's state.
+                // On Wayland, the event's state includes ambient modifiers like
+                // caps lock and numlock (Mod2) that generally wouldn't be part
+                // of a keybinding, so we clear those bits so that SwitcherPopup
+                // can close the popup when the relevant modifiers are released,
+                // instead of waiting for caps/num lock to be released.
+                const modifier_mask = Clutter.ModifierType.MODIFIER_MASK & ~Clutter.ModifierType.LOCK_MASK & ~Clutter.ModifierType.MOD2_MASK;
+                let modifiers = event ? event.get_state() & modifier_mask : 0;
                 this.wm._wsPopupList[monitorIndex].showToggle(false, null, modifiers, toggle);
                 if (monitorIndex === Main.layoutManager.primaryIndex) {
                     this.wm._workspaceSwitcherPopup = this.wm._wsPopupList[monitorIndex];

[email protected]/workspacePopup/workspaceSwitcherPopup.js

@@ -190,11 +190,15 @@ class WorkspaceSwitcherPopup extends SwitcherPopup {
             this._noModsTimeoutId = 0;
         }
 
+        this._items.forEach((x) => x.destroy());
+        this._items = [];
+
         super._onDestroy();
 
         while (modals.length > 0) {
             modals.pop().destroy();
         }
+
     }
 
     vfunc_allocate(box) {

[email protected]/workspacePopup/workspaceSwitcherPopupList.js

@@ -42,8 +42,6 @@ export default GObject.registerClass({
             style: `spacing: ${ITEM_SPACING}`,
         });
         this._lists = [];
-        this._thumbnails = thumbnails;
-        this._workspaceName = workspaceName;
         this._scale = options.scale;
         this._showThumbnails = options.showThumbnails;
         this._showWorkspaceName = options.showWorkspaceNames;
@@ -75,7 +73,7 @@ export default GObject.registerClass({
                 () => this.highlight(workspaceManager.get_active_workspace_index()));
 
         for (let i = 0; i < thumbnails.length; i++) {
-            this.addItem(this._thumbnails[i], this._workspaceName[i]);
+            this.addItem(thumbnails[i], workspaceName[i]);
         }
     }