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

workspace: Disable overlay for inactive workspaces too

Browse Source 
In addition to disabling the overlay when the state is not 1,
disable it also when not in the active workspace.

Make the Workspace class track the workspace's active state,
and resync the overlays when it changes.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1645>
This commit is contained in:
Georges Basile Stavracas Neto 2021-02-05 13:39:13 -03:00 committed by Marge Bot
parent 2e817d3fa8
commit 86cefd906b
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/ui/workspace.js
View File

@ -406,6 +406,7 @@ var WorkspaceLayout = GObject.registerClass({
this._spacing = 20; this._spacing = 20;
this._layoutFrozen = false; this._layoutFrozen = false;
this._metaWorkspace = metaWorkspace;
this._monitorIndex = monitorIndex; this._monitorIndex = monitorIndex;
this._workarea = metaWorkspace this._workarea = metaWorkspace
? metaWorkspace.get_work_area_for_monitor(this._monitorIndex) ? metaWorkspace.get_work_area_for_monitor(this._monitorIndex)
@ -426,8 +427,7 @@ var WorkspaceLayout = GObject.registerClass({
}); });
this._stateAdjustment.connect('notify::value', () => { this._stateAdjustment.connect('notify::value', () => {
[...this._windows.keys()].forEach( this.syncOverlays();
preview => this._syncOverlay(preview));
this.layout_changed(); this.layout_changed();
}); });
} }
@ -697,7 +697,17 @@ var WorkspaceLayout = GObject.registerClass({
} }
_syncOverlay(preview) { _syncOverlay(preview) {
preview.overlay_enabled = this._stateAdjustment.value === 1; const active = this._metaWorkspace?.active ?? true;
preview.overlayEnabled = active && this._stateAdjustment.value === 1;
}
/**
* syncOverlays:
*
* Synchronizes the overlay state of all window previews.
*/
syncOverlays() {
[...this._windows.keys()].forEach(preview => this._syncOverlay(preview));
} }
/** /**
@ -942,6 +952,10 @@ class Workspace extends St.Widget {
}); });
this.metaWorkspace = metaWorkspace; this.metaWorkspace = metaWorkspace;
this._activeWorkspaceChangedId =
this.metaWorkspace?.connect('notify::active', () => {
this.layoutManager.syncOverlays();
});
this._overviewAdjustment = overviewAdjustment; this._overviewAdjustment = overviewAdjustment;
this.monitorIndex = monitorIndex; this.monitorIndex = monitorIndex;
@ -1188,6 +1202,7 @@ class Workspace extends St.Widget {
if (this.metaWorkspace) { if (this.metaWorkspace) {
this.metaWorkspace.disconnect(this._windowAddedId); this.metaWorkspace.disconnect(this._windowAddedId);
this.metaWorkspace.disconnect(this._windowRemovedId); this.metaWorkspace.disconnect(this._windowRemovedId);
this.metaWorkspace.disconnect(this._activeWorkspaceChangedId);
} }
global.display.disconnect(this._windowEnteredMonitorId); global.display.disconnect(this._windowEnteredMonitorId);
global.display.disconnect(this._windowLeftMonitorId); global.display.disconnect(this._windowLeftMonitorId);