Fix initial window position

Author: leolost2605

src/Widgets/WindowClone.vala

@@ -207,8 +207,6 @@ public class Gala.WindowClone : Clutter.Actor {
         set_child_above_sibling (window_icon, clone);
         set_child_above_sibling (window_title, clone);
 
-        transition_to_original_state (false);
-
         check_shadow_requirements ();
 
         if (should_fade ()) {
@@ -221,7 +219,7 @@ public class Gala.WindowClone : Clutter.Actor {
         // window was opened, so we stay at our old place.
         if (was_waiting && slot != null) {
             opacity = 0;
-            take_slot (slot);
+            take_slot (slot, true);
             opacity = 255;
 
             request_reposition ();
@@ -268,7 +266,7 @@ public class Gala.WindowClone : Clutter.Actor {
      *
      * @param animate Animate the transformation of the placement
      */
-    public void transition_to_original_state (bool animate, bool with_gesture = false, bool is_cancel_animation = false) {
+    public void transition_to_original_state (bool with_gesture = false, bool is_cancel_animation = false) {
         var outer_rect = window.get_frame_rect ();
 
         unowned var display = window.get_display ();
@@ -314,11 +312,9 @@ public class Gala.WindowClone : Clutter.Actor {
                 return;
             }
 
-            var duration = (animate && wm.enable_animations) ? MultitaskingView.ANIMATION_DURATION : 0;
+            var duration = wm.enable_animations ? MultitaskingView.ANIMATION_DURATION : 0;
 
-            if (animate) {
-                toggle_shadow (false);
-            }
+            toggle_shadow (false);
 
             window_icon.save_easing_state ();
             window_icon.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
@@ -327,7 +323,7 @@ public class Gala.WindowClone : Clutter.Actor {
             window_icon.restore_easing_state ();
         };
 
-        if (!animate || gesture_tracker == null || !with_gesture || !wm.enable_animations) {
+        if (gesture_tracker == null || !with_gesture || !wm.enable_animations) {
             on_animation_end (1, false, 0);
         } else {
             gesture_tracker.connect_handlers (null, (owned) on_animation_update, (owned) on_animation_end);
@@ -338,25 +334,33 @@ public class Gala.WindowClone : Clutter.Actor {
      * Animate the window to the given slot
      */
 #if HAS_MUTTER45
-    public void take_slot (Mtk.Rectangle rect, bool with_gesture = false, bool is_cancel_animation = false) {
+    public void take_slot (Mtk.Rectangle rect, bool from_window_position, bool with_gesture = false, bool is_cancel_animation = false) {
 #else
-    public void take_slot (Meta.Rectangle rect, bool with_gesture = false, bool is_cancel_animation = false) {
+    public void take_slot (Meta.Rectangle rect, bool from_window_position, bool with_gesture = false, bool is_cancel_animation = false) {
 #endif
         slot = rect;
-        var initial_width = width;
-        var initial_height = height;
+        in_slot_animation = true;
 
         active = false;
+
+        var outer_rect = window.get_frame_rect ();
+
+        float initial_width = from_window_position ? outer_rect.width : width;
+        float initial_height = from_window_position ? outer_rect.height : height;
+
         unowned var display = wm.get_display ();
-        var scale = display.get_monitor_scale (display.get_monitor_index_for_rect (rect));
 
-        in_slot_animation = true;
+        var monitor_geom = display.get_monitor_geometry (window.get_monitor ());
+        float intial_x = from_window_position ? outer_rect.x - monitor_geom.x : x;
+        float intial_y = from_window_position ? outer_rect.y - monitor_geom.y : y;
+
+        var scale = display.get_monitor_scale (display.get_monitor_index_for_rect (rect));
         place_widgets (rect.width, rect.height, scale);
 
-        new GesturePropertyTransition (this, gesture_tracker, "x", null, (float) rect.x).start (with_gesture);
-        new GesturePropertyTransition (this, gesture_tracker, "y", null, (float) rect.y).start (with_gesture);
-        new GesturePropertyTransition (this, gesture_tracker, "width", null, (float) rect.width).start (with_gesture);
-        new GesturePropertyTransition (this, gesture_tracker, "height", null, (float) rect.height).start (with_gesture);
+        new GesturePropertyTransition (this, gesture_tracker, "x", intial_x, (float) rect.x).start (with_gesture);
+        new GesturePropertyTransition (this, gesture_tracker, "y", intial_y, (float) rect.y).start (with_gesture);
+        new GesturePropertyTransition (this, gesture_tracker, "width", (float) initial_width, (float) rect.width).start (with_gesture);
+        new GesturePropertyTransition (this, gesture_tracker, "height", (float) initial_height, (float) rect.height).start (with_gesture);
         new GesturePropertyTransition (this, gesture_tracker, "shadow-opacity", (uint8) 0, (uint8) 255).start (with_gesture);
         var opacity_transition = new GesturePropertyTransition (window_icon, gesture_tracker, "opacity", 0u, 255u);
         opacity_transition.start (with_gesture);

src/Widgets/WindowCloneContainer.vala

@@ -169,7 +169,7 @@ namespace Gala {
          * Recalculate the tiling positions of the windows and animate them to
          * the resulting spots.
          */
-        public void reflow (bool with_gesture = false, bool is_cancel_animation = false) {
+        public void reflow (bool with_gesture = false, bool is_cancel_animation = false, bool opening = false) {
             if (!opened) {
                 return;
             }
@@ -208,7 +208,7 @@ namespace Gala {
 
             foreach (var tilable in window_positions) {
                 unowned var clone = (WindowClone) tilable.id;
-                clone.take_slot (tilable.rect, with_gesture, is_cancel_animation);
+                clone.take_slot (tilable.rect, opening, with_gesture, is_cancel_animation);
             }
         }
 
@@ -395,15 +395,7 @@ namespace Gala {
                 current_window = null;
             }
 
-            // make sure our windows are where they belong in case they were moved
-            // while were closed.
-            if (gesture_tracker == null || !is_cancel_animation) {
-                foreach (var window in get_children ()) {
-                    ((WindowClone) window).transition_to_original_state (false, with_gesture, is_cancel_animation);
-                }
-            }
-
-            reflow (with_gesture, is_cancel_animation);
+            reflow (with_gesture, is_cancel_animation, true);
         }
 
         /**
@@ -418,7 +410,7 @@ namespace Gala {
             opened = false;
 
             foreach (var window in get_children ()) {
-                ((WindowClone) window).transition_to_original_state (true, with_gesture, is_cancel_animation);
+                ((WindowClone) window).transition_to_original_state (with_gesture, is_cancel_animation);
             }
         }
     }