[gnome-shell/wip/exalm/gestures2: 11/12] workspaceAnimation: Group sticky windows and moving window

[Alexander Mikhaylenko <alexm src gnome org>]

commit 23e2bd695efb6de24667e16cf0faa5194e387b4e
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date:   Sat Jun 20 23:44:24 2020 +0500

    workspaceAnimation: Group sticky windows and moving window
    
    Since the transitions consists of window clones now, all the clones appear
    above sticky windows. Clone sticky windows as well, and treat them same as
    moving window instead.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1326

 js/ui/workspaceAnimation.js | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)
---
diff --git a/js/ui/workspaceAnimation.js b/js/ui/workspaceAnimation.js
index dea9fb3138..0eae3c58ba 100644
--- a/js/ui/workspaceAnimation.js
+++ b/js/ui/workspaceAnimation.js
@@ -158,8 +158,7 @@ var WorkspaceAnimationController = class {
         const switchData = {};
 
         this._switchData = switchData;
-        switchData.movingWindowBin = new Clutter.Actor();
-        switchData.movingWindow = null;
+        switchData.stickyGroup = new WorkspaceGroup(null, this.movingWindow);
         switchData.workspaces = [];
         switchData.gestureActivated = false;
         switchData.inProgress = false;
@@ -175,7 +174,7 @@ var WorkspaceAnimationController = class {
         }
 
         Main.uiGroup.insert_child_above(switchData.container, switchData.backgrounds[0]);
-        Main.uiGroup.insert_child_above(switchData.movingWindowBin, switchData.container);
+        Main.uiGroup.insert_child_above(switchData.stickyGroup, switchData.container);
 
         let x = 0;
         let y = 0;
@@ -224,38 +223,14 @@ var WorkspaceAnimationController = class {
             switchData.container.y = -activeInfo.y;
         else
             switchData.container.x = -activeInfo.x;
-
-        if (this.movingWindow) {
-            const windowActor = this.movingWindow.get_compositor_private();
-
-            switchData.movingWindow = {
-                windowActor,
-                parent: windowActor.get_parent(),
-            };
-
-            switchData.movingWindow.parent.remove_child(windowActor);
-            switchData.movingWindowBin.add_child(windowActor);
-            switchData.movingWindow.windowDestroyId = windowActor.connect('destroy', () => {
-                switchData.movingWindow = null;
-            });
-        }
     }
 
     _finishWorkspaceSwitch(switchData) {
         this._switchData = null;
 
-        if (switchData.movingWindow) {
-            const record = switchData.movingWindow;
-            record.windowActor.disconnect(record.windowDestroyId);
-            switchData.movingWindowBin.remove_child(record.windowActor);
-            record.parent.add_child(record.windowActor);
-
-            switchData.movingWindow = null;
-        }
-
         switchData.backgrounds.forEach(bg => bg.destroy());
         switchData.container.destroy();
-        switchData.movingWindowBin.destroy();
+        switchData.stickyGroup.destroy();
 
         this.movingWindow = null;
     }