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

workspace: Account for window picker padding

Browse Source 
Workspaces are supposed to request the work area as their preferred
size, however the widget will adjust the sizes returned by the
layout manager to account for borders and padding.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1345
This commit is contained in:
Florian Müllner 2020-06-26 02:56:35 +02:00
parent b5d925817f
commit 124eb1ca18
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/ui/workspace.js
View File

@ -520,26 +520,40 @@ var WorkspaceLayout = GObject.registerClass({
return this._layout.strategy.computeWindowSlots(this._layout, availArea); return this._layout.strategy.computeWindowSlots(this._layout, availArea);
} }
_getAdjustedWorkarea(container) {
const workarea = this._workarea.copy();
if (container instanceof St.Widget) {
const themeNode = container.get_theme_node();
workarea.width -= themeNode.get_horizontal_padding();
workarea.height -= themeNode.get_vertical_padding();
}
return workarea;
}
vfunc_set_container(container) { vfunc_set_container(container) {
this._container = container; this._container = container;
this._stateAdjustment.actor = container; this._stateAdjustment.actor = container;
} }
vfunc_get_preferred_width(container, forHeight) { vfunc_get_preferred_width(container, forHeight) {
const workarea = this._getAdjustedWorkarea(container);
if (forHeight === -1) if (forHeight === -1)
return [0, this._workarea.width]; return [0, workarea.width];
const workAreaAspectRatio = this._workarea.width / this._workarea.height; const workAreaAspectRatio = workarea.width / workarea.height;
const widthPreservingAspectRatio = forHeight * workAreaAspectRatio; const widthPreservingAspectRatio = forHeight * workAreaAspectRatio;
return [0, widthPreservingAspectRatio]; return [0, widthPreservingAspectRatio];
} }
vfunc_get_preferred_height(container, forWidth) { vfunc_get_preferred_height(container, forWidth) {
const workarea = this._getAdjustedWorkarea(container);
if (forWidth === -1) if (forWidth === -1)
return [0, this._workarea.height]; return [0, workarea.height];
const workAreaAspectRatio = this._workarea.width / this._workarea.height; const workAreaAspectRatio = workarea.width / workarea.height;
const heightPreservingAspectRatio = forWidth / workAreaAspectRatio; const heightPreservingAspectRatio = forWidth / workAreaAspectRatio;
return [0, heightPreservingAspectRatio]; return [0, heightPreservingAspectRatio];