brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup: Use Meta.Workspace.active property

Browse Source 
https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1337
This commit is contained in:
Florian Müllner
2020-06-29 16:50:27 +02:00
parent 73f8c1c482
commit e90466347a
4 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
js/ui/workspace.js
View File

@ -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.