WindowCloneContainer: Use allocate instead of making windows take slots

Author: leolost2605

lib/Gestures/ActorTarget.vala

@@ -15,13 +15,15 @@ public class Gala.ActorTarget : Clutter.Actor, GestureTarget {
 
     private double[] current_progress;
     private double[] current_commit;
+    private bool[] relayout_actions;
     private Gee.List<GestureTarget> targets;
 
     private int ongoing_animations = 0;
 
     construct {
         current_progress = new double[GestureAction.N_ACTIONS];
         current_commit = new double[GestureAction.N_ACTIONS];
+        relayout_actions = new bool[GestureAction.N_ACTIONS];
         targets = new Gee.ArrayList<GestureTarget> ();
 
 #if HAS_MUTTER46
@@ -38,6 +40,10 @@ public class Gala.ActorTarget : Clutter.Actor, GestureTarget {
         }
     }
 
+    public void set_relayout_action (GestureAction action, bool relayout) {
+        relayout_actions[action] = relayout;
+    }
+
     public void add_target (GestureTarget target) {
         targets.add (target);
         sync_target (target);
@@ -88,6 +94,11 @@ public class Gala.ActorTarget : Clutter.Actor, GestureTarget {
                 break;
             case UPDATE:
                 update_progress (action, progress);
+
+                if (relayout_actions[action]) {
+                    queue_relayout ();
+                }
+
                 break;
             case COMMIT:
                 commit_progress (action, progress);

src/Widgets/MultitaskingView/WindowClone.vala

@@ -179,6 +179,8 @@ public class Gala.WindowClone : ActorTarget, RootTarget {
         add_child (window_icon);
 
         set_child_below_sibling (window_icon, window_title);
+
+        update_targets ();
     }
 
     /**
@@ -227,39 +229,13 @@ public class Gala.WindowClone : ActorTarget, RootTarget {
             && window.get_workspace () != window.get_display ().get_workspace_manager ().get_active_workspace ()) || window.minimized;
     }
 
-    /**
-     * Animate the window to the given slot
-     */
-    public void take_slot (Mtk.Rectangle rect, bool animate) {
-        slot = rect;
-
-        if (animate) {
-            save_easing_state ();
-            set_easing_duration (Utils.get_animation_duration (MultitaskingView.ANIMATION_DURATION));
-            set_easing_mode (EASE_OUT_QUAD);
-        }
-
-        update_targets ();
-
-        if (animate) {
-            restore_easing_state ();
-        }
-    }
-
     private void update_targets () {
-        remove_all_targets ();
-
-        if (slot == null) {
+        if (window_icon == null) {
             return;
         }
 
-        var window_rect = window.get_frame_rect ();
-        var monitor_geometry = window.display.get_monitor_geometry (window.get_monitor ());
+        remove_all_targets ();
 
-        add_target (new PropertyTarget (MULTITASKING_VIEW, this, "x", typeof (float), (float) (window_rect.x - monitor_geometry.x), (float) slot.x));
-        add_target (new PropertyTarget (MULTITASKING_VIEW, this, "y", typeof (float), (float) (window_rect.y - monitor_geometry.y), (float) slot.y));
-        add_target (new PropertyTarget (MULTITASKING_VIEW, this, "width", typeof (float), (float) window_rect.width, (float) slot.width));
-        add_target (new PropertyTarget (MULTITASKING_VIEW, this, "height", typeof (float), (float) window_rect.height, (float) slot.height));
         add_target (new PropertyTarget (MULTITASKING_VIEW, this, "shadow-opacity", typeof (uint8), (uint8) 0u, (uint8) 255u));
         if (should_fade ()) {
             add_target (new PropertyTarget (MULTITASKING_VIEW, this, "opacity", typeof (uint8), (uint8) 0u, (uint8) 255u));
@@ -275,7 +251,7 @@ public class Gala.WindowClone : ActorTarget, RootTarget {
     }
 
     public override void update_progress (Gala.GestureAction action, double progress) {
-        if (action != CUSTOM || slot == null || !Meta.Prefs.get_gnome_animations ()) {
+        if (action != CUSTOM || !Meta.Prefs.get_gnome_animations ()) {
             return;
         }
 

src/Widgets/MultitaskingView/WindowCloneContainer.vala

@@ -23,6 +23,9 @@ public class Gala.WindowCloneContainer : ActorTarget {
 
     private bool opened = false;
 
+    private HashTable<Clutter.Actor, Clutter.ActorBox?> target_allocations = new HashTable<Clutter.Actor, Clutter.ActorBox?> (null, null);
+    private HashTable<Clutter.Actor, Clutter.ActorBox?> origin_allocations = new HashTable<Clutter.Actor, Clutter.ActorBox?> (null, null);
+
     /**
      * The window that is currently selected via keyboard shortcuts.
      * It is not necessarily the same as the active window.
@@ -36,6 +39,8 @@ public class Gala.WindowCloneContainer : ActorTarget {
     construct {
         on_items_changed (0, 0, windows.get_n_items ());
         windows.items_changed.connect (on_items_changed);
+
+        set_relayout_action (MULTITASKING_VIEW, true);
     }
 
     private void on_items_changed (uint position, uint removed, uint added) {
@@ -147,8 +152,42 @@ public class Gala.WindowCloneContainer : ActorTarget {
             (int) height - padding_top - padding_bottom
         };
 
+        target_allocations.remove_all ();
+        origin_allocations.remove_all ();
         foreach (var tilable in calculate_grid_placement (area, windows)) {
-            tilable.clone.take_slot (tilable.rect, !view_toggle);
+            var geom = wm.get_display ().get_monitor_geometry (tilable.clone.window.get_monitor ());
+            var rect = tilable.clone.window.get_frame_rect ();
+
+            origin_allocations[tilable.clone] = InternalUtils.actor_box_from_rect (rect.x - geom.x, rect.y - geom.y, rect.width, rect.height);
+            target_allocations[tilable.clone] = InternalUtils.actor_box_from_rect (tilable.rect.x, tilable.rect.y, tilable.rect.width, tilable.rect.height);
+        }
+    }
+
+    protected override void allocate (Clutter.ActorBox box) {
+        set_allocation (box);
+
+        for (var child = get_first_child (); child != null; child = child.get_next_sibling ()) {
+            var target_allocation = target_allocations[child];
+            var origin_allocation = origin_allocations[child];
+
+            if (target_allocation == null || origin_allocation == null) {
+                child.allocate ({0, 0, 0, 0});
+                continue;
+            }
+
+            if (!animating) {
+                child.save_easing_state ();
+                child.set_easing_duration (Utils.get_animation_duration (MultitaskingView.ANIMATION_DURATION));
+                child.set_easing_mode (EASE_OUT_QUAD);
+            }
+
+            child.allocate (
+                origin_allocation.interpolate (target_allocation, get_current_progress (MULTITASKING_VIEW))
+            );
+
+            if (!animating) {
+                child.restore_easing_state ();
+            }
         }
     }