From 14859b400986ba4145e66ddda4d346e758076784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 29 May 2019 14:24:55 -0500 Subject: [PATCH] window-list: Pass the actor as PopupMenuManager owner PopupMenuManager's grabHelper starting from gnome-shell@7bb84da must be an actor, so pass it explicitly instead of expecting the shell to do it for us. This fixes an error during pushModal that was causing a grab not to be released. https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/68 --- extensions/window-list/extension.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js index 637842e2..738da21d 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -221,7 +221,7 @@ class BaseButton { this.actor.connect('destroy', this._onDestroy.bind(this)); this.actor.connect('popup-menu', this._onPopupMenu.bind(this)); - this._contextMenuManager = new PopupMenu.PopupMenuManager(this); + this._contextMenuManager = new PopupMenu.PopupMenuManager(this.actor); this._switchWorkspaceId = global.window_manager.connect( 'switch-workspace', this._updateVisibility.bind(this)); @@ -481,7 +481,7 @@ class AppButton extends BaseButton { this._multiWindowTitle.add(label); this._multiWindowTitle.label_actor = label; - this._menuManager = new PopupMenu.PopupMenuManager(this); + this._menuManager = new PopupMenu.PopupMenuManager(this.actor); this._menu = new PopupMenu.PopupMenu(this.actor, 0.5, St.Side.BOTTOM); this._menu.connect('open-state-changed', _onMenuStateChanged); this._menu.actor.hide(); @@ -809,7 +809,7 @@ class WindowList { this._updateWorkspaceIndicatorVisibility.bind(this)); this._updateWorkspaceIndicatorVisibility(); - this._menuManager = new PopupMenu.PopupMenuManager(this); + this._menuManager = new PopupMenu.PopupMenuManager(this.actor); this._menuManager.addMenu(this._workspaceIndicator.menu); Main.layoutManager.addChrome(this.actor, {