[gnome-shell] workspace: Use actual container allocation



commit 75f8903c7e714828a532fc6eff9032a2280bd716
Author: Florian Müllner <fmuellner gnome org>
Date:   Fri Jun 26 03:22:29 2020 +0200

    workspace: Use actual container allocation
    
    We currently assume that the passed in Clutter.ActorBox matches
    the container allocation, but in reality it is the container's
    content area.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1345

 js/ui/workspace.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index f4189ec4da..0caf95d379 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -560,9 +560,10 @@ var WorkspaceLayout = GObject.registerClass({
     }
 
     vfunc_allocate(container, box) {
+        const containerBox = container.allocation;
         const containerAllocationChanged =
-            this._lastBox === null || !this._lastBox.equal(box);
-        this._lastBox = box.copy();
+            this._lastBox === null || !this._lastBox.equal(containerBox);
+        this._lastBox = containerBox.copy();
 
         // If the containers size changed, we can no longer keep around
         // the old windowSlots, so we must unfreeze the layout
@@ -582,7 +583,7 @@ var WorkspaceLayout = GObject.registerClass({
                 this._windowSlots = this._getWindowSlots(box.copy());
         }
 
-        const allocationScale = box.get_width() / this._workarea.width;
+        const allocationScale = containerBox.get_width() / this._workarea.width;
 
         const workspaceBox = new Clutter.ActorBox();
         const layoutBox = new Clutter.ActorBox();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]