From a19128ef885d8a933af364651b21e519f583f82a Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>

Date: Wed, 29 May 2019 10:17:20 +0000

Subject: [PATCH 01/22] places-menu: Don't hardcode position

The extension currently assumes that we have the "Activities" button

at the left of the top bar. This is currently true, not only in the

regular session, but also in GNOME classic where the button is hidden

(but still present).

However this is about to change: We will stop taking over the button

from the apps-menu extension, and instead disable "Activities" from

the session mode definition.

Prepare for this by adding the places menu before the application menu

instead of assuming a hardcoded position.

https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/69

---

 extensions/places-menu/extension.js | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/places-menu/extension.js b/extensions/places-menu/extension.js

index c477a4a..5c038ae 100644

--- a/extensions/places-menu/extension.js

+++ b/extensions/places-menu/extension.js

@@ -135,9 +135,9 @@ let _indicator;

 function enable() {

     _indicator = new PlacesMenu;

-    let pos = 1;

+    let pos = Main.sessionMode.panel.left.indexOf('appMenu');

     if ('apps-menu' in Main.panel.statusArea)

-        pos = 2;

+        pos++;

     Main.panel.addToStatusArea('places-menu', _indicator, pos, 'left');

 }

-- 

2.21.0

From 075f6d45b242061be774ba5d3d8c2236cacd64c5 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>

Date: Wed, 29 May 2019 08:32:03 +0000

Subject: [PATCH 02/22] apps-menu: Stop taking over Activities button

We don't want the "Activities" button in GNOME Classic, but the current

way of handling it is confusing:

 - the button is hidden, but the corresponding hot corner

   sometimes works (when the application menu isn't open)

 - the button is effectively moved inside the menu, although

   it's clearly not an app or category

 - the apps-menu can be used independent from classic mode, in

   which case removing the "Activities" button may not be wanted

Address those points by removing any handling of the activities button

from the apps-menu extension. We will remove it again from the classic

session via a session mode tweak.

https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/69

---

 extensions/apps-menu/extension.js | 67 +++----------------------------

 1 file changed, 6 insertions(+), 61 deletions(-)

diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js

index cc399c6..d6c9c8b 100644

--- a/extensions/apps-menu/extension.js

+++ b/extensions/apps-menu/extension.js

@@ -25,22 +25,6 @@ const NAVIGATION_REGION_OVERSHOOT = 50;

 Gio._promisify(Gio._LocalFilePrototype, 'query_info_async', 'query_info_finish');

 Gio._promisify(Gio._LocalFilePrototype, 'set_attributes_async', 'set_attributes_finish');

-class ActivitiesMenuItem extends PopupMenu.PopupBaseMenuItem {

-    constructor(button) {

-        super();

-        this._button = button;

-        let label = new St.Label({ text: _('Activities Overview') });

-        this.actor.add_child(label);

-        this.actor.label_actor = label;

-    }

-

-    activate(event) {

-        this._button.menu.toggle();

-        Main.overview.toggle();

-        super.activate(event);

-    }

-}

-

 class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {

     constructor(button, app) {

         super();

@@ -233,21 +217,6 @@ class ApplicationsMenu extends PopupMenu.PopupMenu {

         return false;

     }

-    open(animate) {

-        this._button.hotCorner.setBarrierSize(0);

-        if (this._button.hotCorner.actor) // fallback corner

-            this._button.hotCorner.actor.hide();

-        super.open(animate);

-    }

-

-    close(animate) {

-        let size = Main.layoutManager.panelBox.height;

-        this._button.hotCorner.setBarrierSize(size);

-        if (this._button.hotCorner.actor) // fallback corner

-            this._button.hotCorner.actor.show();

-        super.close(animate);

-    }

-

     toggle() {

         if (this.isOpen) {

             this._button.selectCategory(null);

@@ -381,7 +350,7 @@ Signals.addSignalMethods(DesktopTarget.prototype);

 let ApplicationsButton = GObject.registerClass(

 class ApplicationsButton extends PanelMenu.Button {

-    _init() {

+    _init(includeIcon) {

         super._init(1.0, null, false);

         this.setMenu(new ApplicationsMenu(this, 1.0, St.Side.TOP, this));

@@ -398,7 +367,8 @@ class ApplicationsButton extends PanelMenu.Button {

             '/usr/share/icons/hicolor/scalable/apps/start-here.svg');

         this._icon = new St.Icon({

             gicon: new Gio.FileIcon({ file: iconFile }),

-            style_class: 'panel-logo-icon'

+            style_class: 'panel-logo-icon',

+            visible: includeIcon

         });

         hbox.add_actor(this._icon);

@@ -414,8 +384,6 @@ class ApplicationsButton extends PanelMenu.Button {

         this.name = 'panelApplications';

         this.label_actor = this._label;

-        this.connect('captured-event', this._onCapturedEvent.bind(this));

-

         this._showingId = Main.overview.connect('showing', () => {

             this.add_accessible_state (Atk.StateType.CHECKED);

         });

@@ -457,10 +425,6 @@ class ApplicationsButton extends PanelMenu.Button {

         }

     }

-    get hotCorner() {

-        return Main.layoutManager.hotCorners[Main.layoutManager.primaryIndex];

-    }

-

     _createVertSeparator() {

         let separator = new St.DrawingArea({

             style_class: 'calendar-vertical-separator',

@@ -487,14 +451,6 @@ class ApplicationsButton extends PanelMenu.Button {

         this._desktopTarget.destroy();

     }

-    _onCapturedEvent(actor, event) {

-        if (event.type() == Clutter.EventType.BUTTON_PRESS) {

-            if (!Main.overview.shouldToggleByCornerOrButton())

-                return true;

-        }

-        return false;

-    }

-

     _onMenuKeyPress(actor, event) {

         let symbol = event.get_key_symbol();

         if (symbol == Clutter.KEY_Left || symbol == Clutter.KEY_Right) {

@@ -638,14 +594,6 @@ class ApplicationsButton extends PanelMenu.Button {

             y_align: St.Align.START

         });

-        let activities = new ActivitiesMenuItem(this);

-        this.leftBox.add(activities.actor, {

-            expand: false,

-            x_fill: true,

-            y_fill: false,

-            y_align: St.Align.START

-        });

-

         this.applicationsBox = new St.BoxLayout({ vertical: true });

         this.applicationsScrollBox.add_actor(this.applicationsBox);

         this.categoriesBox = new St.BoxLayout({ vertical: true });

@@ -757,19 +705,16 @@ class ApplicationsButton extends PanelMenu.Button {

 });

 let appsMenuButton;

-let activitiesButton;

 function enable() {

-    activitiesButton = Main.panel.statusArea['activities'];

-    activitiesButton.container.hide();

-    appsMenuButton = new ApplicationsButton();

-    Main.panel.addToStatusArea('apps-menu', appsMenuButton, 1, 'left');

+    let index = Main.sessionMode.panel.left.indexOf('activities') + 1;

+    appsMenuButton = new ApplicationsButton(index == 0);

+    Main.panel.addToStatusArea('apps-menu', appsMenuButton, index, 'left');

 }

 function disable() {

     Main.panel.menuManager.removeMenu(appsMenuButton.menu);

     appsMenuButton.destroy();

-    activitiesButton.container.show();

 }

 function init() {

-- 

2.21.0

From e8b2f5206b659398931cfc961954b5d744d52728 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>

Date: Fri, 7 Jun 2019 14:30:16 +0000

Subject: [PATCH 03/22] apps-menu: Stop hiding the overview when toggled

Now that the extension no longer doubles as the "Activities" button,

that behavior is confusing.

https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/69

---

 extensions/apps-menu/extension.js | 6 +-----

 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js

index d6c9c8b..76bcd1a 100644

--- a/extensions/apps-menu/extension.js

+++ b/extensions/apps-menu/extension.js

@@ -218,12 +218,8 @@ class ApplicationsMenu extends PopupMenu.PopupMenu {

     }

     toggle() {

-        if (this.isOpen) {

+        if (this.isOpen)

             this._button.selectCategory(null);

-        } else {

-            if (Main.overview.visible)

-                Main.overview.hide();

-        }

         super.toggle();

     }

 }

-- 

2.21.0

From bcd2c97e89bc90675525dbd05207ae25a91d39df Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>

Date: Fri, 7 Jun 2019 20:07:19 +0000

Subject: [PATCH 04/22] apps-menu: Hide overview when launching app

Now that we no longer hide the overview when the menu is opened,

it is possible to activate menu entries from the overview. Start

hiding the overview in that case, which is consistent with app

launching elsewhere.

https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/69

---

 extensions/apps-menu/extension.js | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js

index 76bcd1a..b9e7111 100644

--- a/extensions/apps-menu/extension.js

+++ b/extensions/apps-menu/extension.js

@@ -66,6 +66,8 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {

         this._button.selectCategory(null);

         this._button.menu.toggle();

         super.activate(event);

+

+        Main.overview.hide();

     }

     setActive(active, params) {

-- 

2.21.0

From c118895cff4cedfb43f0ae875d5cd355f66f0db7 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>

Date: Wed, 29 May 2019 09:44:30 +0000

Subject: [PATCH 05/22] classic: Disable overview

The overview is one of the defining features of GNOME 3, and thus

almost by definition at odds with the classic session, which

emulates a traditional GNOME 2 desktop.

Even with the less prominent placement inside the application menu

it never quite fit in - it doesn't help that besides the different

UI paradigma, the overview keeps its "normal" styling which differs

greatly with classic's normal mode.

So besides removing the "Activities" button via the session mode

definition, now that the apps-menu extension doesn't replace it anymore,

disable the overview completely in the classic session.

https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/69

---

 data/classic.json.in | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/classic.json.in b/data/classic.json.in

index fdb3762..c1c0544 100644

--- a/data/classic.json.in

+++ b/data/classic.json.in

@@ -1,8 +1,9 @@

 {

     "parentMode": "user",

     "stylesheetName": "gnome-classic.css",

+    "hasOverview": false,

     "enabledExtensions": [@CLASSIC_EXTENSIONS@],

-    "panel": { "left": ["activities", "appMenu"],

+    "panel": { "left": ["appMenu"],

                "center": [],

                "right": ["a11y", "keyboard", "dateMenu", "aggregateMenu"]

              }

-- 

2.21.0

From 004affc147579e2b1a11614cd0c8faf99e307999 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>

Date: Wed, 5 Jun 2019 00:23:13 +0000

Subject: [PATCH 06/22] window-list: Split out workspaceIndicator

The extension has grown unwieldily big, so before starting to improve

on the workspace indicator, move it to its own source file.

https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/70

---

 extensions/window-list/extension.js          | 130 +-----------------

 extensions/window-list/meson.build           |   2 +-

 extensions/window-list/workspaceIndicator.js | 135 +++++++++++++++++++

 3 files changed, 138 insertions(+), 129 deletions(-)

 create mode 100644 extensions/window-list/workspaceIndicator.js

diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js

index e1ea742..5275d9c 100644

--- a/extensions/window-list/extension.js

+++ b/extensions/window-list/extension.js

@@ -1,13 +1,13 @@

 /* exported init */

-const { Clutter, Gio, GLib, GObject, Gtk, Meta, Shell, St } = imports.gi;

+const { Clutter, Gio, GLib, Gtk, Meta, Shell, St } = imports.gi;

 const DND = imports.ui.dnd;

 const Main = imports.ui.main;

-const PanelMenu = imports.ui.panelMenu;

 const PopupMenu = imports.ui.popupMenu;

 const ExtensionUtils = imports.misc.extensionUtils;

 const Me = ExtensionUtils.getCurrentExtension();

+const { WorkspaceIndicator } = Me.imports.workspaceIndicator;

 const Gettext = imports.gettext.domain('gnome-shell-extensions');

 const _ = Gettext.gettext;

@@ -644,132 +644,6 @@ class AppButton extends BaseButton {

 }

-let WorkspaceIndicator = GObject.registerClass(

-class WorkspaceIndicator extends PanelMenu.Button {

-    _init() {

-        super._init(0.0, _('Workspace Indicator'), true);

-        this.setMenu(new PopupMenu.PopupMenu(this, 0.0, St.Side.BOTTOM));

-        this.add_style_class_name('window-list-workspace-indicator');

-        this.menu.actor.remove_style_class_name('panel-menu');

-

-        let container = new St.Widget({

-            layout_manager: new Clutter.BinLayout(),

-            x_expand: true,

-            y_expand: true

-        });

-        this.add_actor(container);

-

-        let workspaceManager = global.workspace_manager;

-

-        this._currentWorkspace = workspaceManager.get_active_workspace().index();

-        this.statusLabel = new St.Label({

-            text: this._getStatusText(),

-            x_align: Clutter.ActorAlign.CENTER,

-            y_align: Clutter.ActorAlign.CENTER

-        });

-        container.add_actor(this.statusLabel);

-

-        this.workspacesItems = [];

-

-        this._workspaceManagerSignals = [];

-        this._workspaceManagerSignals.push(workspaceManager.connect('notify::n-workspaces',

-                                                                    this._updateMenu.bind(this)));

-        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-switched',

-                                                                          this._updateIndicator.bind(this)));

-

-        this.connect('scroll-event', this._onScrollEvent.bind(this));

-        this._updateMenu();

-

-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.wm.preferences' });

-        this._settingsChangedId =

-            this._settings.connect('changed::workspace-names',

-                                   this._updateMenu.bind(this));

-    }

-

-    _onDestroy() {

-        for (let i = 0; i < this._workspaceManagerSignals.length; i++)

-            global.workspace_manager.disconnect(this._workspaceManagerSignals[i]);

-

-        if (this._settingsChangedId) {

-            this._settings.disconnect(this._settingsChangedId);

-            this._settingsChangedId = 0;

-        }

-

-        super._onDestroy();

-    }

-

-    _updateIndicator() {

-        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);

-        this._currentWorkspace = global.workspace_manager.get_active_workspace().index();

-        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);

-

-        this.statusLabel.set_text(this._getStatusText());

-    }

-

-    _getStatusText() {

-        let workspaceManager = global.workspace_manager;

-        let current = workspaceManager.get_active_workspace().index();

-        let total = workspaceManager.n_workspaces;

-

-        return '%d / %d'.format(current + 1, total);

-    }

-

-    _updateMenu() {

-        let workspaceManager = global.workspace_manager;

-

-        this.menu.removeAll();

-        this.workspacesItems = [];

-        this._currentWorkspace = workspaceManager.get_active_workspace().index();

-

-        for (let i = 0; i < workspaceManager.n_workspaces; i++) {

-            let name = Meta.prefs_get_workspace_name(i);

-            let item = new PopupMenu.PopupMenuItem(name);

-            item.workspaceId = i;

-

-            item.connect('activate', (item, _event) => {

-                this._activate(item.workspaceId);

-            });

-

-            if (i == this._currentWorkspace)

-                item.setOrnament(PopupMenu.Ornament.DOT);

-

-            this.menu.addMenuItem(item);

-            this.workspacesItems[i] = item;

-        }

-

-        this.statusLabel.set_text(this._getStatusText());

-    }

-

-    _activate(index) {

-        let workspaceManager = global.workspace_manager;

-

-        if (index >= 0 && index < workspaceManager.n_workspaces) {

-            let metaWorkspace = workspaceManager.get_workspace_by_index(index);

-            metaWorkspace.activate(global.get_current_time());

-        }

-    }

-

-    _onScrollEvent(actor, event) {

-        let direction = event.get_scroll_direction();

-        let diff = 0;

-        if (direction == Clutter.ScrollDirection.DOWN) {

-            diff = 1;

-        } else if (direction == Clutter.ScrollDirection.UP) {

-            diff = -1;

-        } else {

-            return;

-        }

-

-        let newIndex = this._currentWorkspace + diff;

-        this._activate(newIndex);

-    }

-

-    _allocate(actor, box, flags) {

-        if (actor.get_n_children() > 0)

-            actor.get_first_child().allocate(box, flags);

-    }

-});

-

 class WindowList {

     constructor(perMonitor, monitor) {

         this._perMonitor = perMonitor;

diff --git a/extensions/window-list/meson.build b/extensions/window-list/meson.build

index b4aa4db..74025f9 100644

--- a/extensions/window-list/meson.build

+++ b/extensions/window-list/meson.build

@@ -4,7 +4,7 @@ extension_data += configure_file(

   configuration: metadata_conf

 )

-extension_sources += files('prefs.js')

+extension_sources += files('prefs.js', 'workspaceIndicator.js')

 extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')

 if classic_mode_enabled

diff --git a/extensions/window-list/workspaceIndicator.js b/extensions/window-list/workspaceIndicator.js

new file mode 100644

index 0000000..fb3ffe7

--- /dev/null

+++ b/extensions/window-list/workspaceIndicator.js

@@ -0,0 +1,135 @@

+/* exported WorkspaceIndicator */

+const { Clutter, Gio, GObject, Meta, St } = imports.gi;

+

+const PanelMenu = imports.ui.panelMenu;

+const PopupMenu = imports.ui.popupMenu;

+

+const Gettext = imports.gettext.domain('gnome-shell-extensions');

+const _ = Gettext.gettext;

+

+var WorkspaceIndicator = GObject.registerClass(

+class WorkspaceIndicator extends PanelMenu.Button {

+    _init() {

+        super._init(0.0, _('Workspace Indicator'), true);

+        this.setMenu(new PopupMenu.PopupMenu(this, 0.0, St.Side.BOTTOM));

+        this.add_style_class_name('window-list-workspace-indicator');

+        this.menu.actor.remove_style_class_name('panel-menu');

+

+        let container = new St.Widget({

+            layout_manager: new Clutter.BinLayout(),

+            x_expand: true,

+            y_expand: true

+        });

+        this.add_actor(container);

+

+        let workspaceManager = global.workspace_manager;

+

+        this._currentWorkspace = workspaceManager.get_active_workspace().index();

+        this.statusLabel = new St.Label({

+            text: this._getStatusText(),

+            x_align: Clutter.ActorAlign.CENTER,

+            y_align: Clutter.ActorAlign.CENTER

+        });

+        container.add_actor(this.statusLabel);

+

+        this.workspacesItems = [];

+

+        this._workspaceManagerSignals = [

+            workspaceManager.connect('notify::n-workspaces',

+                this._updateMenu.bind(this)),

+            workspaceManager.connect_after('workspace-switched',

+                this._updateIndicator.bind(this))

+        ];

+

+        this.connect('scroll-event', this._onScrollEvent.bind(this));

+        this._updateMenu();

+

+        this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.wm.preferences' });

+        this._settingsChangedId = this._settings.connect(

+            'changed::workspace-names', this._updateMenu.bind(this));

+    }

+

+    _onDestroy() {

+        for (let i = 0; i < this._workspaceManagerSignals.length; i++)

+            global.workspace_manager.disconnect(this._workspaceManagerSignals[i]);

+

+        if (this._settingsChangedId) {

+            this._settings.disconnect(this._settingsChangedId);

+            this._settingsChangedId = 0;

+        }

+

+        super._onDestroy();

+    }

+

+    _updateIndicator() {

+        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);

+        this._currentWorkspace = global.workspace_manager.get_active_workspace().index();

+        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);

+

+        this.statusLabel.set_text(this._getStatusText());

+    }

+

+    _getStatusText() {

+        let workspaceManager = global.workspace_manager;

+        let current = workspaceManager.get_active_workspace().index();

+        let total = workspaceManager.n_workspaces;

+

+        return '%d / %d'.format(current + 1, total);

+    }

+

+    _updateMenu() {

+        let workspaceManager = global.workspace_manager;

+

+        this.menu.removeAll();

+        this.workspacesItems = [];

+        this._currentWorkspace = workspaceManager.get_active_workspace().index();

+

+        for (let i = 0; i < workspaceManager.n_workspaces; i++) {

+            let name = Meta.prefs_get_workspace_name(i);

+            let item = new PopupMenu.PopupMenuItem(name);

+            item.workspaceId = i;

+

+            item.connect('activate', (item, _event) => {

+                this._activate(item.workspaceId);

+            });

+

+            if (i == this._currentWorkspace)

+                item.setOrnament(PopupMenu.Ornament.DOT);

+

+            this.menu.addMenuItem(item);

+            this.workspacesItems[i] = item;

+        }

+

+        this.statusLabel.set_text(this._getStatusText());

+    }

+

+    _activate(index) {

+        let workspaceManager = global.workspace_manager;

+

+        if (index >= 0 && index < workspaceManager.n_workspaces) {

+            let metaWorkspace = workspaceManager.get_workspace_by_index(index);

+            metaWorkspace.activate(global.get_current_time());

+        }

+    }

+

+    _onScrollEvent(actor, event) {

+        let direction = event.get_scroll_direction();

+        let diff = 0;

+        if (direction == Clutter.ScrollDirection.DOWN) {

+            diff = 1;

+        } else if (direction == Clutter.ScrollDirection.UP) {

+            diff = -1;

+        } else {

+            return;

+        }

+

+        let newIndex = this._currentWorkspace + diff;

+        this._activate(newIndex);

+    }

+

+    _allocate(actor, box, flags) {

+        if (actor.get_n_children() > 0)

+            actor.get_first_child().allocate(box, flags);

+    }

+});

+

-- 

2.21.0

From cceda34bfcd3de806a7b72bb532e1f8a248accee Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>

Date: Wed, 5 Jun 2019 17:39:53 +0000

Subject: [PATCH 07/22] window-list: Use a more specific GTypeName for

 workspace indicator

Now that the class inherits from GObject, the generic name easily

conflicts with other classes otherwise, for example with the one

from the workspace-indicator extension.

https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/70

---

 extensions/window-list/workspaceIndicator.js | 5 +++--

 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/extensions/window-list/workspaceIndicator.js b/extensions/window-list/workspaceIndicator.js

index fb3ffe7..8ac43eb 100644

--- a/extensions/window-list/workspaceIndicator.js

+++ b/extensions/window-list/workspaceIndicator.js

@@ -7,8 +7,9 @@ const PopupMenu = imports.ui.popupMenu;

 const Gettext = imports.gettext.domain('gnome-shell-extensions');

 const _ = Gettext.gettext;

-var WorkspaceIndicator = GObject.registerClass(

-class WorkspaceIndicator extends PanelMenu.Button {

+var WorkspaceIndicator = GObject.registerClass({

+    GTypeName: 'WindowListWorkspaceIndicator'

+}, class WorkspaceIndicator extends PanelMenu.Button {

     _init() {

         super._init(0.0, _('Workspace Indicator'), true);

         this.setMenu(new PopupMenu.PopupMenu(this, 0.0, St.Side.BOTTOM));

-- 

2.21.0

From 57a97bef2e2cfb88324e9d1540254dca8f5195e3 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>

Date: Wed, 5 Jun 2019 04:54:50 +0200

Subject: [PATCH 08/22] window-list: Make some properties private

There's no reason why they should be public.

https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/70

---

 extensions/window-list/workspaceIndicator.js | 18 +++++++++---------

 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/extensions/window-list/workspaceIndicator.js b/extensions/window-list/workspaceIndicator.js

index 8ac43eb..7c0360a 100644

--- a/extensions/window-list/workspaceIndicator.js

+++ b/extensions/window-list/workspaceIndicator.js

@@ -26,14 +26,14 @@ var WorkspaceIndicator = GObject.registerClass({

         let workspaceManager = global.workspace_manager;

         this._currentWorkspace = workspaceManager.get_active_workspace().index();

-        this.statusLabel = new St.Label({

+        this._statusLabel = new St.Label({

             text: this._getStatusText(),

             x_align: Clutter.ActorAlign.CENTER,

             y_align: Clutter.ActorAlign.CENTER

         });

-        container.add_actor(this.statusLabel);

+        container.add_actor(this._statusLabel);

-        this.workspacesItems = [];

+        this._workspacesItems = [];

         this._workspaceManagerSignals = [

             workspaceManager.connect('notify::n-workspaces',

@@ -63,11 +63,11 @@ var WorkspaceIndicator = GObject.registerClass({