[gnome-shell/wip/rstrode/login-screen-extensions: 109/134] workspacesView: Avoid setting invalid geometries on views

[Ray Strode <halfline src gnome org>]

commit 88d945ea291142ffc91ee5e4c05fb76707fac800
Author: Jonas Dreßler <verdre v0yd nl>
Date:   Wed May 20 12:05:04 2020 +0200

    workspacesView: Avoid setting invalid geometries on views
    
    The fullGeometry and the actualGeometry of the WorkspacesDisplay are set
    from the allocation of the overviews ControlsManager and the
    WorkspacesDisplay, that means they're only valid after those actors got
    their allocations during Clutters allocation cycle.
    
    Since WorkspacesDisplay._updateWorkspacesViews() is already called while
    showing/mapping the WorkspacesDisplay, that allocation cycle didn't
    happen yet and we end up either setting the geometries of the views to
    null (in case of the fullGeometry) or to something wrong (a 0-sized
    allocation in case of the actualGeometry).
    
    So avoid setting invalid geometries on the views by initializing both
    the fullGeometry and the actualGeometry to null, and then only updating
    the geometries of the views after they're set to a correct value.
    
    Note that this means we won't correctly animate the overview the first
    time we open it since the animation depends on the geometries being set,
    but is being started from show(), which means no allocations have
    happened yet. In practice this introduces no regression though since
    before this change we simply used incorrect geometries (see the 0-sized
    allocation mentioned above) on the initial opening and the animation
    didn't work either.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1119

 js/ui/workspacesView.js | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index e302296a65..02baddc6ef 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -521,6 +521,7 @@ var WorkspacesDisplay = class {
         this._scrollEventId = 0;
         this._keyPressEventId = 0;
 
+        this._actualGeometry = null;
         this._fullGeometry = null;
     }
 
@@ -675,8 +676,10 @@ var WorkspacesDisplay = class {
 
         this._workspacesViews.forEach(v => v.actor.show());
 
-        this._updateWorkspacesFullGeometry();
-        this._updateWorkspacesActualGeometry();
+        if (this._fullGeometry)
+            this._syncWorkspacesFullGeometry();
+        if (this._actualGeometry)
+            this._syncWorkspacesActualGeometry();
     }
 
     _scrollValueChanged() {
@@ -739,10 +742,10 @@ var WorkspacesDisplay = class {
     // the sliding controls were never slid in at all.
     setWorkspacesFullGeometry(geom) {
         this._fullGeometry = geom;
-        this._updateWorkspacesFullGeometry();
+        this._syncWorkspacesFullGeometry();
     }
 
-    _updateWorkspacesFullGeometry() {
+    _syncWorkspacesFullGeometry() {
         if (!this._workspacesViews.length)
             return;
 
@@ -754,18 +757,21 @@ var WorkspacesDisplay = class {
     }
 
     _updateWorkspacesActualGeometry() {
+        const [x, y] = this.actor.get_transformed_position();
+        const width = this.actor.allocation.get_width();
+        const height = this.actor.allocation.get_height();
+
+        this._actualGeometry = { x, y, width, height };
+        this._syncWorkspacesActualGeometry();
+    }
+
+    _syncWorkspacesActualGeometry() {
         if (!this._workspacesViews.length)
             return;
 
-        let [x, y] = this.actor.get_transformed_position();
-        let allocation = this.actor.allocation;
-        let width = allocation.x2 - allocation.x1;
-        let height = allocation.y2 - allocation.y1;
-        let primaryGeometry = { x: x, y: y, width: width, height: height };
-
         let monitors = Main.layoutManager.monitors;
         for (let i = 0; i < monitors.length; i++) {
-            let geometry = (i == this._primaryIndex) ? primaryGeometry : monitors[i];
+            let geometry = i === this._primaryIndex ? this._actualGeometry : monitors[i];
             this._workspacesViews[i].setActualGeometry(geometry);
         }
     }