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

workspace: Clip background

Browse Source 
So that windows don't overflow the workspace background.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1599>
This commit is contained in:
Florian Müllner 2020-06-26 22:41:22 +02:00 committed by Marge Bot
parent 8eb81ae649
commit 9062d5dc78
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
js/ui/workspace.js
View File

@ -854,14 +854,20 @@ class WorkspaceBackground extends St.Widget {
}); });
this._monitorIndex = monitorIndex; this._monitorIndex = monitorIndex;
this._workarea = Main.layoutManager.getWorkAreaForMonitor(monitorIndex);
this._bin = new Clutter.Actor({
layout_manager: new Clutter.BinLayout(),
clip_to_allocation: true,
});
this._backgroundGroup = new Meta.BackgroundGroup({ this._backgroundGroup = new Meta.BackgroundGroup({
layout_manager: new Clutter.BinLayout(),
x_expand: true, x_expand: true,
y_expand: true, y_expand: true,
reactive: false,
layout_manager: new Clutter.BinLayout(),
}); });
this.add_child(this._backgroundGroup); this._bin.add_child(this._backgroundGroup);
this.add_child(this._bin);
this._bgManager = new Background.BackgroundManager({ this._bgManager = new Background.BackgroundManager({
container: this._backgroundGroup, container: this._backgroundGroup,
@ -873,6 +879,27 @@ class WorkspaceBackground extends St.Widget {
this.connect('destroy', this._onDestroy.bind(this)); this.connect('destroy', this._onDestroy.bind(this));
} }
vfunc_allocate(box) {
this.set_allocation(box);
const themeNode = this.get_theme_node();
const contentBox = themeNode.get_content_box(box);
this._bin.allocate(contentBox);
const [contentWidth, contentHeight] = contentBox.get_size();
const monitor = Main.layoutManager.monitors[this._monitorIndex];
const xOff = (contentWidth / this._workarea.width) *
(this._workarea.x - monitor.x);
const yOff = (contentHeight / this._workarea.height) *
(this._workarea.y - monitor.y);
contentBox.x1 -= xOff;
contentBox.y1 -= yOff;
contentBox.set_size(xOff + contentWidth, yOff + contentHeight);
this._backgroundGroup.allocate(contentBox);
}
_onDestroy() { _onDestroy() {
if (this._bgManager) { if (this._bgManager) {
this._bgManager.destroy(); this._bgManager.destroy();