[gnome-shell/wip/exalm/gestures: 14/16] workspaceAnimation: Only create moving window bin when needed



commit beefed898b5e8d419678bea96ae38978402600e3
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Fri Jul 5 15:48:38 2019 +0500

    workspaceAnimation: Only create moving window bin when needed
    
    https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/605

 js/ui/workspaceAnimation.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/js/ui/workspaceAnimation.js b/js/ui/workspaceAnimation.js
index 27eb1dc12e..d9732b47b7 100644
--- a/js/ui/workspaceAnimation.js
+++ b/js/ui/workspaceAnimation.js
@@ -97,7 +97,6 @@ var WorkspaceAnimation = GObject.registerClass({
         this.connect('destroy', this._onDestroy.bind(this));
 
         this._controller = controller;
-        this._movingWindowBin = new Clutter.Actor();
         this._movingWindow = null;
         this._surroundings = {};
         this._progress = 0;
@@ -106,7 +105,6 @@ var WorkspaceAnimation = GObject.registerClass({
 
         this.add_actor(this._container);
         global.window_group.add_actor(this);
-        global.window_group.add_actor(this._movingWindowBin);
 
         let workspaceManager = global.workspace_manager;
         let curWs = workspaceManager.get_workspace_by_index(from);
@@ -139,19 +137,22 @@ var WorkspaceAnimation = GObject.registerClass({
             info.actor.set_position(x, y);
         }
 
-        global.window_group.set_child_above_sibling(this._movingWindowBin, null);
-
         if (this._controller.movingWindow) {
             let actor = this._controller.movingWindow.get_compositor_private();
+            let container = new Clutter.Actor();
 
-            this._movingWindow = { window: actor,
+            this._movingWindow = { container,
+                                   window: actor,
                                    parent: actor.get_parent() };
 
             this._movingWindow.parent.remove_child(actor);
-            this._movingWindowBin.add_child(actor);
+            this._movingWindow.container.add_child(actor);
             this._movingWindow.windowDestroyId = actor.connect('destroy', () => {
                 this._movingWindow = null;
             });
+
+            global.window_group.add_actor(container);
+            global.window_group.set_child_above_sibling(container, null);
         }
     }
 
@@ -163,12 +164,12 @@ var WorkspaceAnimation = GObject.registerClass({
             record.window.disconnect(record.windowDestroyId);
             record.window.get_parent().remove_child(record.window);
             record.parent.add_child(record.window);
+            record.container.destroy();
 
             this._movingWindow = null;
         }
 
         this._container.destroy();
-        this._movingWindowBin.destroy();
     }
 
     _getPositionForDirection(direction, fromWs, toWs) {


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