From dab326c17ee3be159dc73feca4c7c99eaf3eff21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 5 Jun 2019 04:59:19 +0200 Subject: [PATCH] window-list: Minor cleanup Mutter has a dedicated method for getting the index of the active workspace, use that instead of getting first the active workspace and then its index. https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/70 --- extensions/window-list/workspaceIndicator.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/window-list/workspaceIndicator.js b/extensions/window-list/workspaceIndicator.js index 98888384..1f2e1c18 100644 --- a/extensions/window-list/workspaceIndicator.js +++ b/extensions/window-list/workspaceIndicator.js @@ -25,7 +25,7 @@ var WorkspaceIndicator = GObject.registerClass({ let workspaceManager = global.workspace_manager; - this._currentWorkspace = workspaceManager.get_active_workspace().index(); + this._currentWorkspace = workspaceManager.get_active_workspace_index(); this._statusLabel = new St.Label({ text: this._getStatusText(), x_align: Clutter.ActorAlign.CENTER, @@ -64,7 +64,7 @@ var WorkspaceIndicator = GObject.registerClass({ _updateIndicator() { this._workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE); - this._currentWorkspace = global.workspace_manager.get_active_workspace().index(); + this._currentWorkspace = global.workspace_manager.get_active_workspace_index(); this._workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT); this._statusLabel.set_text(this._getStatusText()); @@ -72,7 +72,7 @@ var WorkspaceIndicator = GObject.registerClass({ _getStatusText() { let workspaceManager = global.workspace_manager; - let current = workspaceManager.get_active_workspace().index(); + let current = workspaceManager.get_active_workspace_index(); let total = workspaceManager.n_workspaces; return '%d / %d'.format(current + 1, total); @@ -91,7 +91,7 @@ var WorkspaceIndicator = GObject.registerClass({ this.menu.removeAll(); this._workspacesItems = []; - this._currentWorkspace = workspaceManager.get_active_workspace().index(); + this._currentWorkspace = workspaceManager.get_active_workspace_index(); for (let i = 0; i < workspaceManager.n_workspaces; i++) { let name = Meta.prefs_get_workspace_name(i);