From 8c49f45ac8ce1a785bed95a49cbc2d9f420650ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Fri, 12 Jun 2020 20:12:11 +0200 Subject: [PATCH] workspace: Set overviewHint on MetaWindow We want to stop using the MetaWindowActor for things which are actually related to the MetaWindow, one more thing where we can change that is the overviewHint, which is currently added to the MetaWindowActor. So move that hint to the MetaWindow and stop calling get_compositor_private() in a few more places. https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1307 --- js/ui/workspace.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/js/ui/workspace.js b/js/ui/workspace.js index 2bf98da5d..5af6fbec7 100644 --- a/js/ui/workspace.js +++ b/js/ui/workspace.js @@ -1459,7 +1459,7 @@ class Workspace extends St.Widget { const [transformedWidth, transformedHeight] = clone.get_transformed_size(); - win._overviewHint = { + metaWin._overviewHint = { x: stageX, y: stageY, width: transformedWidth, @@ -1536,12 +1536,12 @@ class Workspace extends St.Widget { let clone = this._addWindowClone(win, false); - if (win._overviewHint) { - let x = win._overviewHint.x - this.x; - let y = win._overviewHint.y - this.y; - const width = win._overviewHint.width; - const height = win._overviewHint.height; - delete win._overviewHint; + if (metaWin._overviewHint) { + let x = metaWin._overviewHint.x - this.x; + let y = metaWin._overviewHint.y - this.y; + const width = metaWin._overviewHint.width; + const height = metaWin._overviewHint.height; + delete metaWin._overviewHint; clone.positioned = true; @@ -1985,7 +1985,7 @@ class Workspace extends St.Widget { // Set a hint on the Mutter.Window so its initial position // in the new workspace will be correct - window.get_compositor_private()._overviewHint = { + window._overviewHint = { x: actor.x, y: actor.y, width: actor.width,