Some fixes and use in workspace clone

Author: leolost2605

src/Gestures/PropertyGestureTransition.vala

@@ -5,22 +5,25 @@ public class Gala.PropertyGestureTransition : Object {
     public Value? from_value { get; construct; }
     public Value to_value { get; construct; }
     public bool with_gesture { get; construct; }
+    public Value? intermediate_value { get; construct; }
 
     public PropertyGestureTransition (
         Clutter.Actor actor,
         GestureTracker gesture_tracker,
         string property,
         Value? from_value,
         Value to_value,
-        bool with_gesture
+        bool with_gesture,
+        Value? intermediate_value = null
     ) {
         Object (
             actor: actor,
             gesture_tracker: gesture_tracker,
             property: property,
             from_value: from_value,
             to_value: to_value,
-            with_gesture: with_gesture
+            with_gesture: with_gesture,
+            intermediate_value: intermediate_value
         );
     }
 
@@ -38,18 +41,18 @@ public class Gala.PropertyGestureTransition : Object {
         };
 
         GestureTracker.OnUpdate on_animation_update = (percentage) => {
-            var animation_value = GestureTracker.animation_value (value_to_float (from_value), value_to_float (to_value), percentage);
+            var animation_value = GestureTracker.animation_value (value_to_float (from_value), value_to_float (intermediate_value ?? to_value), percentage);
             actor.set_property (property, value_from_float (animation_value));
         };
 
-        GestureTracker.OnEnd on_animation_end = (percentage, cancel_action) => {
+        GestureTracker.OnEnd on_animation_end = (percentage, cancel_action, calculated_duration) => {
             if (cancel_action) {
                 return;
             }
 
             actor.save_easing_state ();
             actor.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
-            actor.set_easing_duration (500);
+            actor.set_easing_duration (calculated_duration);
             actor.set_property (property, cancel_action ? from_value : to_value);
             actor.restore_easing_state ();
 
@@ -60,7 +63,7 @@ public class Gala.PropertyGestureTransition : Object {
             gesture_tracker.connect_handlers (on_animation_begin, on_animation_update, on_animation_end);
         } else {
             on_animation_begin (0);
-            on_animation_end (1, false, 0);
+            on_animation_end (1, false, gesture_tracker.min_animation_duration);
         }
     }
 

src/Widgets/MultitaskingView.vala

@@ -383,60 +383,17 @@ namespace Gala {
                 target_workspace.activate (display.get_current_time ());
             }
 
-            new PropertyGestureTransition (workspaces, workspace_gesture_tracker, "x", null, target_x, true);
-
-            GestureTracker.OnUpdate on_animation_update = (percentage) => {
-                var x = GestureTracker.animation_value (initial_x, target_x, percentage, true);
-                var icon_group_opacity = GestureTracker.animation_value (0.0f, 1.0f, percentage, false);
-
-                if (is_nudge_animation) {
-                    x = x.clamp (initial_x - nudge_gap, initial_x + nudge_gap);
-                }
-
-                //  workspaces.x = x;
-
-                if (!is_nudge_animation) {
-                    active_icon_group.backdrop_opacity = 1.0f - icon_group_opacity;
-                    target_icon_group.backdrop_opacity = icon_group_opacity;
-                }
-            };
+            if (is_nudge_animation) {
+                new PropertyGestureTransition (workspaces, workspace_gesture_tracker, "x", null, initial_x, true, initial_x + nudge_gap * -relative_dir);
+            } else {
+                new PropertyGestureTransition (workspaces, workspace_gesture_tracker, "x", null, target_x, true);
+                new PropertyGestureTransition (active_icon_group, workspace_gesture_tracker, "backdrop-opacity", 1f, 0f, true);
+                new PropertyGestureTransition (target_icon_group, workspace_gesture_tracker, "backdrop-opacity", 0f, 1f, true);
+            }
 
             GestureTracker.OnEnd on_animation_end = (percentage, cancel_action, calculated_duration) => {
                 switching_workspace_with_gesture = false;
 
-                var duration = is_nudge_animation ?
-                               (uint) (AnimationDuration.NUDGE / 2) :
-                               (uint) calculated_duration;
-
-                //  workspaces.save_easing_state ();
-                //  workspaces.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
-                //  workspaces.set_easing_duration (duration);
-                //  workspaces.x = (is_nudge_animation || cancel_action) ? initial_x : target_x;
-                //  workspaces.restore_easing_state ();
-
-                if (!is_nudge_animation) {
-                    if (wm.enable_animations) {
-                        var active_transition = new Clutter.PropertyTransition ("backdrop-opacity") {
-                            duration = duration,
-                            remove_on_complete = true
-                        };
-                        active_transition.set_from_value (active_icon_group.backdrop_opacity);
-                        active_transition.set_to_value (cancel_action ? 1.0f : 0.0f);
-                        active_icon_group.add_transition ("backdrop-opacity", active_transition);
-
-                        var target_transition = new Clutter.PropertyTransition ("backdrop-opacity") {
-                            duration = duration,
-                            remove_on_complete = true
-                        };
-                        target_transition.set_from_value (target_icon_group.backdrop_opacity);
-                        target_transition.set_to_value (cancel_action ? 0.0f : 1.0f);
-                        target_icon_group.add_transition ("backdrop-opacity", target_transition);
-                    } else {
-                        active_icon_group.backdrop_opacity = cancel_action ? 1.0f : 0.0f;
-                        target_icon_group.backdrop_opacity = cancel_action ? 0.0f : 1.0f;
-                    }
-                }
-
                 if (is_nudge_animation || cancel_action) {
                     active_workspace.activate (display.get_current_time ());
                 }
@@ -445,7 +402,7 @@ namespace Gala {
             if (!wm.enable_animations) {
                 on_animation_end (1, false, 0);
             } else {
-                workspace_gesture_tracker.connect_handlers (null, (owned) on_animation_update, (owned) on_animation_end);
+                workspace_gesture_tracker.connect_handlers (null, null, (owned) on_animation_end);
             }
         }
 

src/Widgets/WorkspaceClone.vala

@@ -365,46 +365,13 @@ namespace Gala {
 
             var scale = (float)(monitor.height - InternalUtils.scale_to_int (TOP_OFFSET + BOTTOM_OFFSET, scale_factor)) / monitor.height;
             var pivot_y = InternalUtils.scale_to_int (TOP_OFFSET, scale_factor) / (monitor.height - monitor.height * scale);
+            background.set_pivot_point (0.5f, pivot_y);
 
             update_size (monitor);
 
-            GestureTracker.OnBegin on_animation_begin = () => {
-                x = initial_x;
-                background.set_pivot_point (0.5f, pivot_y);
-            };
-
-            GestureTracker.OnUpdate on_animation_update = (percentage) => {
-                var x = GestureTracker.animation_value (initial_x, target_x, percentage);
-                set_x (x);
-
-                var update_scale = (double) GestureTracker.animation_value (1.0f, (float)scale, percentage);
-                background.set_scale (update_scale, update_scale);
-            };
-
-            GestureTracker.OnEnd on_animation_end = (percentage, cancel_action) => {
-                if (cancel_action) {
-                    return;
-                }
-
-                save_easing_state ();
-                set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
-                set_easing_duration (wm.enable_animations ? MultitaskingView.ANIMATION_DURATION : 0);
-                set_x (target_x);
-                restore_easing_state ();
-
-                background.save_easing_state ();
-                background.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
-                background.set_easing_duration (wm.enable_animations ? MultitaskingView.ANIMATION_DURATION : 0);
-                background.set_scale (scale, scale);
-                background.restore_easing_state ();
-            };
-
-            if (!with_gesture || !wm.enable_animations) {
-                on_animation_begin (0);
-                on_animation_end (1, false, 0);
-            } else {
-                gesture_tracker.connect_handlers ((owned) on_animation_begin, (owned) on_animation_update, (owned)on_animation_end);
-            }
+            new PropertyGestureTransition (this, gesture_tracker, "x", initial_x, target_x, with_gesture);
+            new PropertyGestureTransition (background, gesture_tracker, "scale-x", 1.0f, (float) scale, with_gesture);
+            new PropertyGestureTransition (background, gesture_tracker, "scale-y", 1.0f, (float) scale, with_gesture);
 
 #if HAS_MUTTER45
             Mtk.Rectangle area = {
@@ -448,38 +415,9 @@ namespace Gala {
             double initial_scale_x, initial_scale_y;
             background.get_scale (out initial_scale_x, out initial_scale_y);
 
-            GestureTracker.OnUpdate on_animation_update = (percentage) => {
-                var x = GestureTracker.animation_value (initial_x, target_x, percentage);
-                set_x (x);
-
-                double scale_x = (double) GestureTracker.animation_value ((float) initial_scale_x, 1.0f, percentage);
-                double scale_y = (double) GestureTracker.animation_value ((float) initial_scale_y, 1.0f, percentage);
-                background.set_scale (scale_x, scale_y);
-            };
-
-            GestureTracker.OnEnd on_animation_end = (percentage, cancel_action) => {
-                if (cancel_action) {
-                    return;
-                }
-
-                save_easing_state ();
-                set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
-                set_easing_duration (wm.enable_animations ? MultitaskingView.ANIMATION_DURATION : 0);
-                set_x (target_x);
-                restore_easing_state ();
-
-                background.save_easing_state ();
-                background.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
-                background.set_easing_duration (wm.enable_animations ? MultitaskingView.ANIMATION_DURATION : 0);
-                background.set_scale (1, 1);
-                background.restore_easing_state ();
-            };
-
-            if (!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);
-            }
+            new PropertyGestureTransition (this, gesture_tracker, "x", initial_x, target_x, with_gesture);
+            new PropertyGestureTransition (background, gesture_tracker, "scale-x", initial_scale_x, 1.0f, with_gesture);
+            new PropertyGestureTransition (background, gesture_tracker, "scale-y", initial_scale_y, 1.0f, with_gesture);
 
             window_container.close (with_gesture, is_cancel_animation);
         }