From f8bae050368408df285b6471121528b4c1a676ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 19 Jul 2019 20:24:44 +0200 Subject: [PATCH] cleanup: Stop using PopupMenuItem.actor properties Popup menu items are now actor subclasses, and their actor property points to the item itself. https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/84 --- extensions/drive-menu/extension.js | 2 +- extensions/window-list/extension.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js index 3b17f565..963abfe8 100644 --- a/extensions/drive-menu/extension.js +++ b/extensions/drive-menu/extension.js @@ -152,7 +152,7 @@ class DriveMenu extends PanelMenu.Button { } _updateMenuVisibility() { - if (this._mounts.filter(i => i.actor.visible).length > 0) + if (this._mounts.filter(i => i.visible).length > 0) this.show(); else this.hide(); diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js index 6af96344..690c407c 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -435,12 +435,12 @@ class AppContextMenu extends PopupMenu.PopupMenu { open(animate) { let windows = this._appButton.getWindowList(); - this._minimizeItem.actor.visible = windows.some(w => !w.minimized); - this._unminimizeItem.actor.visible = windows.some(w => w.minimized); - this._maximizeItem.actor.visible = windows.some(w => { + this._minimizeItem.visible = windows.some(w => !w.minimized); + this._unminimizeItem.visible = windows.some(w => w.minimized); + this._maximizeItem.visible = windows.some(w => { return w.get_maximized() != Meta.MaximizeFlags.BOTH; }); - this._unmaximizeItem.actor.visible = windows.some(w => { + this._unmaximizeItem.visible = windows.some(w => { return w.get_maximized() == Meta.MaximizeFlags.BOTH; }); @@ -605,7 +605,7 @@ class AppButton extends BaseButton { for (let i = 0; i < windows.length; i++) { let windowTitle = new WindowTitle(windows[i]); let item = new PopupMenu.PopupBaseMenuItem(); - item.actor.add_actor(windowTitle.actor); + item.add_actor(windowTitle.actor); item._window = windows[i]; this._menu.addMenuItem(item); }