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

workspaceThumbnail: Remove wallpaper

Browse Source 
They'll be replaced by a stylized background color to make them look
symbolic.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1593>
This commit is contained in:
Georges Basile Stavracas Neto 2021-01-25 21:10:44 -03:00 committed by Marge Bot
parent 0d4bce9fa7
commit 451ba5b03a
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
js/ui/workspaceThumbnail.js
View File

@ -3,7 +3,6 @@
const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi; const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
const Background = imports.ui.background;
const DND = imports.ui.dnd; const DND = imports.ui.dnd;
const Main = imports.ui.main; const Main = imports.ui.main;
const Workspace = imports.ui.workspace; const Workspace = imports.ui.workspace;
@ -271,8 +270,6 @@ var WorkspaceThumbnail = GObject.registerClass({
this.connect('destroy', this._onDestroy.bind(this)); this.connect('destroy', this._onDestroy.bind(this));
this._createBackground();
let workArea = Main.layoutManager.getWorkAreaForMonitor(this.monitorIndex); let workArea = Main.layoutManager.getWorkAreaForMonitor(this.monitorIndex);
this.setPorthole(workArea.x, workArea.y, workArea.width, workArea.height); this.setPorthole(workArea.x, workArea.y, workArea.width, workArea.height);
@ -311,12 +308,6 @@ var WorkspaceThumbnail = GObject.registerClass({
this._collapseFraction = 0; // Not collapsed this._collapseFraction = 0; // Not collapsed
} }
_createBackground() {
this._bgManager = new Background.BackgroundManager({ monitorIndex: Main.layoutManager.primaryIndex,
container: this._contents,
vignette: false });
}
setPorthole(x, y, width, height) { setPorthole(x, y, width, height) {
this._contents.set_size(width, height); this._contents.set_size(width, height);
} }
@ -332,14 +323,10 @@ var WorkspaceThumbnail = GObject.registerClass({
return indexA - indexB; return indexA - indexB;
}); });
for (let i = 0; i < this._windows.length; i++) { for (let i = 1; i < this._windows.length; i++) {
let clone = this._windows[i]; let clone = this._windows[i];
if (i == 0) { const previousClone = this._windows[i - 1];
clone.setStackAbove(this._bgManager.backgroundActor); clone.setStackAbove(previousClone);
} else {
let previousClone = this._windows[i - 1];
clone.setStackAbove(previousClone);
}
} }
} }
@ -480,12 +467,6 @@ var WorkspaceThumbnail = GObject.registerClass({
_onDestroy() { _onDestroy() {
this.workspaceRemoved(); this.workspaceRemoved();
if (this._bgManager) {
this._bgManager.destroy();
this._bgManager = null;
}
this._windows = []; this._windows = [];
} }
@ -523,9 +504,7 @@ var WorkspaceThumbnail = GObject.registerClass({
}); });
this._contents.add_actor(clone); this._contents.add_actor(clone);
if (this._windows.length == 0) if (this._windows.length > 0)
clone.setStackAbove(this._bgManager.backgroundActor);
else
clone.setStackAbove(this._windows[this._windows.length - 1]); clone.setStackAbove(this._windows[this._windows.length - 1]);
this._windows.push(clone); this._windows.push(clone);