From e90466347a24fb758a9b4056d4fd561a3ecec237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Mon, 29 Jun 2020 16:50:27 +0200
Subject: [PATCH] cleanup: Use Meta.Workspace.active property

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1337
---
 js/ui/windowManager.js      | 15 ++++-----------
 js/ui/workspace.js          | 18 +++++-------------
 js/ui/workspaceThumbnail.js |  4 +---
 js/ui/workspacesView.js     |  3 +--
 4 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 15e0ab624..2ff1ffdcb 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -1800,8 +1800,7 @@ var WindowManager = class {
             w.window.get_parent().remove_child(w.window);
             w.parent.add_child(w.window);
 
-            if (w.window.get_meta_window().get_workspace() !=
-                global.workspace_manager.get_active_workspace())
+            if (!w.window.get_meta_window().get_workspace().active)
                 w.window.hide();
         }
         switchData.container.destroy();
@@ -1985,7 +1984,7 @@ var WindowManager = class {
             duration,
             mode: Clutter.AnimationMode.EASE_OUT_CUBIC,
             onComplete: () => {
-                if (newWs !== activeWorkspace)
+                if (!newWs.active)
                     this.actionMoveWorkspace(newWs);
                 this._finishWorkspaceSwitch(switchData);
             },
@@ -2185,10 +2184,7 @@ var WindowManager = class {
         if (!Main.sessionMode.hasWorkspaces)
             return;
 
-        let workspaceManager = global.workspace_manager;
-        let activeWorkspace = workspaceManager.get_active_workspace();
-
-        if (activeWorkspace != workspace)
+        if (!workspace.active)
             workspace.activate(global.get_current_time());
     }
 
@@ -2196,10 +2192,7 @@ var WindowManager = class {
         if (!Main.sessionMode.hasWorkspaces)
             return;
 
-        let workspaceManager = global.workspace_manager;
-        let activeWorkspace = workspaceManager.get_active_workspace();
-
-        if (activeWorkspace != workspace) {
+        if (!workspace.active) {
             // This won't have any effect for "always sticky" windows
             // (like desktop windows or docks)
 
diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index e28f67e61..dc1c087ff 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -601,9 +601,8 @@ class Workspace extends St.Widget {
         let area = padArea(this._actualGeometry, padding);
         let slots = strategy.computeWindowSlots(layout, area);
 
-        let workspaceManager = global.workspace_manager;
-        let currentWorkspace = workspaceManager.get_active_workspace();
-        let isOnCurrentWorkspace = this.metaWorkspace == null || this.metaWorkspace == currentWorkspace;
+        const isOnCurrentWorkspace =
+            this.metaWorkspace === null || this.metaWorkspace.active;
 
         for (let i = 0; i < slots.length; i++) {
             let slot = slots[i];
@@ -861,9 +860,7 @@ class Workspace extends St.Widget {
         if (this._windows.length == 0)
             return;
 
-        let workspaceManager = global.workspace_manager;
-        let activeWorkspace = workspaceManager.get_active_workspace();
-        if (this.metaWorkspace != null && this.metaWorkspace != activeWorkspace)
+        if (this.metaWorkspace !== null && !this.metaWorkspace.active)
             return;
 
         // Special case maximized windows, since it doesn't make sense
@@ -915,9 +912,7 @@ class Workspace extends St.Widget {
             this._repositionWindowsId = 0;
         }
 
-        let workspaceManager = global.workspace_manager;
-        let activeWorkspace = workspaceManager.get_active_workspace();
-        if (this.metaWorkspace != null && this.metaWorkspace != activeWorkspace)
+        if (this.metaWorkspace !== null && !this.metaWorkspace.active)
             return;
 
         // Special case maximized windows, since it doesn't make sense
@@ -981,9 +976,6 @@ class Workspace extends St.Widget {
     }
 
     zoomFromOverview() {
-        let workspaceManager = global.workspace_manager;
-        let currentWorkspace = workspaceManager.get_active_workspace();
-
         this.leavingOverview = true;
 
         for (let i = 0; i < this._windows.length; i++)
@@ -995,7 +987,7 @@ class Workspace extends St.Widget {
         }
         this._overviewHiddenId = Main.overview.connect('hidden', this._doneLeavingOverview.bind(this));
 
-        if (this.metaWorkspace != null && this.metaWorkspace != currentWorkspace)
+        if (this.metaWorkspace !== null && !this.metaWorkspace.active)
             return;
 
         // Position and scale the windows.
diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index 73f8b7ec9..611bccfad 100644
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -549,9 +549,7 @@ var WorkspaceThumbnail = GObject.registerClass({
             return;
 
         // a click on the already current workspace should go back to the main view
-        let workspaceManager = global.workspace_manager;
-        let activeWorkspace = workspaceManager.get_active_workspace();
-        if (this.metaWorkspace == activeWorkspace)
+        if (this.metaWorkspace.active)
             Main.overview.hide();
         else
             this.metaWorkspace.activate(time);
diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index a6098cac4..77524ed6b 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -574,14 +574,13 @@ class WorkspacesDisplay extends St.Widget {
         this._clickAction.release();
 
         let workspaceManager = global.workspace_manager;
-        let activeWorkspace = workspaceManager.get_active_workspace();
         let newWs = workspaceManager.get_workspace_by_index(endProgress);
 
         this._scrollAdjustment.ease(endProgress, {
             mode: Clutter.AnimationMode.EASE_OUT_CUBIC,
             duration,
             onComplete: () => {
-                if (newWs !== activeWorkspace)
+                if (!newWs.active)
                     newWs.activate(global.get_current_time());
                 this._endTouchGesture();
             },