From 2d650e51a5727e12b76c25068815e6cc365f3f6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Sun, 31 May 2020 23:19:59 +0200 Subject: [PATCH] workspace: Use boundingBox instead of getOriginalPosition() The getOriginalPosition() API of WindowClone can easily be replaced by using the existing boundingBox property, which reflects the windows bounding box in absolute coordinates. This property is also used everywhere else in the Workspace object, so we can use it here, too. https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1294 --- js/ui/workspace.js | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/js/ui/workspace.js b/js/ui/workspace.js index 960514911..6521275ea 100644 --- a/js/ui/workspace.js +++ b/js/ui/workspace.js @@ -274,10 +274,6 @@ var WindowClone = GObject.registerClass({ return this._boundingBox.height; } - getOriginalPosition() { - return [this._boundingBox.x, this._boundingBox.y]; - } - _computeBoundingBox() { let rect = this.metaWindow.get_frame_rect(); @@ -1726,11 +1722,10 @@ class Workspace extends St.Widget { overlay.hide(); if (clone.metaWindow.showing_on_its_workspace()) { - let [origX, origY] = clone.getOriginalPosition(); clone.scale_x = 1; clone.scale_y = 1; - clone.x = origX; - clone.y = origY; + clone.x = clone.boundingBox.x; + clone.y = clone.boundingBox.y; clone.ease({ opacity, duration, @@ -1778,10 +1773,9 @@ class Workspace extends St.Widget { overlay.hide(); if (clone.metaWindow.showing_on_its_workspace()) { - let [origX, origY] = clone.getOriginalPosition(); clone.ease({ - x: origX, - y: origY, + x: clone.boundingBox.x, + y: clone.boundingBox.y, scale_x: 1, scale_y: 1, opacity: 255,