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

workspace: Use boundingBox to get absolute width and height of window

Browse Source 
Since we're going to override the fixed width and height of the
ClutterActor the WindowClone is subclassing, remove those confusing
getter methods for width and height and switch to the public boundingBox
for getting that information.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1294
This commit is contained in:
Jonas Dreßler 2020-05-31 23:33:00 +02:00 committed by Georges Basile Stavracas Neto
parent 2d650e51a5
commit bf40d96a83
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
js/ui/workspace.js
View File

@ -266,14 +266,6 @@ var WindowClone = GObject.registerClass({
return this._boundingBox; return this._boundingBox;
} }
get width() {
return this._boundingBox.width;
}
get height() {
return this._boundingBox.height;
}
_computeBoundingBox() { _computeBoundingBox() {
let rect = this.metaWindow.get_frame_rect(); let rect = this.metaWindow.get_frame_rect();
@ -867,7 +859,7 @@ var LayoutStrategy = class {
// thumbnails is much more important to preserve than the width of // thumbnails is much more important to preserve than the width of
// them, so two windows with equal height, but maybe differering // them, so two windows with equal height, but maybe differering
// widths line up. // widths line up.
let ratio = window.height / this._monitor.height; let ratio = window.boundingBox.height / this._monitor.height;
// The purpose of this manipulation here is to prevent windows // The purpose of this manipulation here is to prevent windows
// from getting too small. For something like a calculator window, // from getting too small. For something like a calculator window,
@ -987,11 +979,11 @@ var LayoutStrategy = class {
let window = row.windows[j]; let window = row.windows[j];
let s = scale * this._computeWindowScale(window) * row.additionalScale; let s = scale * this._computeWindowScale(window) * row.additionalScale;
let cellWidth = window.width * s; let cellWidth = window.boundingBox.width * s;
let cellHeight = window.height * s; let cellHeight = window.boundingBox.height * s;
s = Math.min(s, WINDOW_CLONE_MAXIMUM_SCALE); s = Math.min(s, WINDOW_CLONE_MAXIMUM_SCALE);
let cloneWidth = window.width * s; let cloneWidth = window.boundingBox.width * s;
let cloneX = x + (cellWidth - cloneWidth) / 2; let cloneX = x + (cellWidth - cloneWidth) / 2;
let cloneY = row.y + row.height * row.additionalScale - cellHeight + compensation; let cloneY = row.y + row.height * row.additionalScale - cellHeight + compensation;
@ -1045,7 +1037,7 @@ var UnalignedLayoutStrategy = class extends LayoutStrategy {
for (let i = 0; i < windows.length; i++) { for (let i = 0; i < windows.length; i++) {
let window = windows[i]; let window = windows[i];
let s = this._computeWindowScale(window); let s = this._computeWindowScale(window);
totalWidth += window.width * s; totalWidth += window.boundingBox.width * s;
} }
let idealRowWidth = totalWidth / numRows; let idealRowWidth = totalWidth / numRows;
@ -1063,8 +1055,8 @@ var UnalignedLayoutStrategy = class extends LayoutStrategy {
for (; windowIdx < sortedWindows.length; windowIdx++) { for (; windowIdx < sortedWindows.length; windowIdx++) {
let window = sortedWindows[windowIdx]; let window = sortedWindows[windowIdx];
let s = this._computeWindowScale(window); let s = this._computeWindowScale(window);
let width = window.width * s; let width = window.boundingBox.width * s;
let height = window.height * s; let height = window.boundingBox.height * s;
row.fullHeight = Math.max(row.fullHeight, height); row.fullHeight = Math.max(row.fullHeight, height);
// either new width is < idealWidth or new width is nearer from idealWidth then oldWidth // either new width is < idealWidth or new width is nearer from idealWidth then oldWidth
@ -1348,8 +1340,8 @@ class Workspace extends St.Widget {
if (clone.inDrag) if (clone.inDrag)
continue; continue;
let cloneWidth = clone.width * scale; let cloneWidth = clone.boundingBox.width * scale;
let cloneHeight = clone.height * scale; let cloneHeight = clone.boundingBox.height * scale;
clone.slot = [x, y, cloneWidth, cloneHeight]; clone.slot = [x, y, cloneWidth, cloneHeight];
let cloneCenter = x + cloneWidth / 2; let cloneCenter = x + cloneWidth / 2;
@ -1488,7 +1480,7 @@ class Workspace extends St.Widget {
win._overviewHint = { win._overviewHint = {
x: stageX, x: stageX,
y: stageY, y: stageY,
scale: stageWidth / clone.width, scale: stageWidth / clone.boundingBox.width,
}; };
} }
clone.destroy(); clone.destroy();
@ -1567,7 +1559,7 @@ class Workspace extends St.Widget {
let scale = win._overviewHint.scale; let scale = win._overviewHint.scale;
delete win._overviewHint; delete win._overviewHint;
clone.slot = [x, y, clone.width * scale, clone.height * scale]; clone.slot = [x, y, clone.boundingBox.width * scale, clone.boundingBox.height * scale];
clone.positioned = true; clone.positioned = true;
clone.set_position(x, y); clone.set_position(x, y);