Skip to content

Commit

Permalink
workspaceThumbnail: Remove wallpaper
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
GeorgesStavracas authored and Marge Bot committed Jan 29, 2021
1 parent 0d4bce9 commit 451ba5b
Showing 1 changed file with 4 additions and 25 deletions.
29 changes: 4 additions & 25 deletions js/ui/workspaceThumbnail.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;

const Background = imports.ui.background;
const DND = imports.ui.dnd;
const Main = imports.ui.main;
const Workspace = imports.ui.workspace;
Expand Down Expand Up @@ -271,8 +270,6 @@ var WorkspaceThumbnail = GObject.registerClass({

this.connect('destroy', this._onDestroy.bind(this));

this._createBackground();

let workArea = Main.layoutManager.getWorkAreaForMonitor(this.monitorIndex);
this.setPorthole(workArea.x, workArea.y, workArea.width, workArea.height);

Expand Down Expand Up @@ -311,12 +308,6 @@ var WorkspaceThumbnail = GObject.registerClass({
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) {
this._contents.set_size(width, height);
}
Expand All @@ -332,14 +323,10 @@ var WorkspaceThumbnail = GObject.registerClass({
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];
if (i == 0) {
clone.setStackAbove(this._bgManager.backgroundActor);
} else {
let previousClone = this._windows[i - 1];
clone.setStackAbove(previousClone);
}
const previousClone = this._windows[i - 1];
clone.setStackAbove(previousClone);
}
}

Expand Down Expand Up @@ -480,12 +467,6 @@ var WorkspaceThumbnail = GObject.registerClass({

_onDestroy() {
this.workspaceRemoved();

if (this._bgManager) {
this._bgManager.destroy();
this._bgManager = null;
}

this._windows = [];
}

Expand Down Expand Up @@ -523,9 +504,7 @@ var WorkspaceThumbnail = GObject.registerClass({
});
this._contents.add_actor(clone);

if (this._windows.length == 0)
clone.setStackAbove(this._bgManager.backgroundActor);
else
if (this._windows.length > 0)
clone.setStackAbove(this._windows[this._windows.length - 1]);

this._windows.push(clone);
Expand Down

0 comments on commit 451ba5b

Please sign in to comment.