Multitasking view desktop workspace switch

src/Background/BackgroundContainer.vala

@@ -28,7 +28,12 @@ public class Gala.BackgroundContainer : Meta.BackgroundGroup {
             }
         });
 
-        set_black_background (true);
+#if HAS_MUTTER47
+        background_color = Cogl.Color.from_string ("Black");
+#else
+        background_color = Clutter.Color.from_string ("Black");
+#endif
+
         update ();
     }
 
@@ -37,14 +42,6 @@ public class Gala.BackgroundContainer : Meta.BackgroundGroup {
         monitor_manager.monitors_changed.disconnect (update);
     }
 
-    public void set_black_background (bool black) {
-#if HAS_MUTTER47
-        set_background_color (black ? Cogl.Color.from_string ("Black") : null);
-#else
-        set_background_color (black ? Clutter.Color.from_string ("Black") : null);
-#endif
-    }
-
     private void update () {
         var reference_child = (get_child_at_index (0) as BackgroundManager);
         if (reference_child != null)

src/Gestures/ActorTarget.vala

@@ -17,19 +17,25 @@ public class Gala.ActorTarget : Clutter.Actor, GestureTarget {
         }
     }
 
+    public bool animating { get { return ongoing_animations > 0; } }
+
     private double[] current_progress;
+    private double[] current_commit;
     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];
         targets = new Gee.ArrayList<GestureTarget> ();
 
         child_added.connect (on_child_added);
     }
 
     private void sync_target (GestureTarget target) {
         for (int action = 0; action < current_progress.length; action++) {
-            target.propagate (COMMIT, action, current_progress[action]);
+            target.propagate (COMMIT, action, current_commit[action]);
             target.propagate (UPDATE, action, current_progress[action]);
         }
     }
@@ -51,16 +57,35 @@ public class Gala.ActorTarget : Clutter.Actor, GestureTarget {
         return current_progress[action];
     }
 
+    public double get_current_commit (GestureAction action) {
+        return current_commit[action];
+    }
+
     public virtual void start_progress (GestureAction action) {}
     public virtual void update_progress (GestureAction action, double progress) {}
     public virtual void commit_progress (GestureAction action, double to) {}
     public virtual void end_progress (GestureAction action) {}
 
     public override void propagate (UpdateType update_type, GestureAction action, double progress) {
-        current_progress[action] = progress;
+        if (update_type == COMMIT) {
+            current_commit[action] = progress;
+        } else {
+            current_progress[action] = progress;
+        }
+
+        foreach (var target in targets) {
+            target.propagate (update_type, action, progress);
+        }
+
+        for (var child = get_first_child (); child != null; child = child.get_next_sibling ()) {
+            if (child is ActorTarget) {
+                child.propagate (update_type, action, progress);
+            }
+        }
 
         switch (update_type) {
             case START:
+                ongoing_animations++;
                 start_progress (action);
                 break;
             case UPDATE:
@@ -70,19 +95,10 @@ public class Gala.ActorTarget : Clutter.Actor, GestureTarget {
                 commit_progress (action, progress);
                 break;
             case END:
+                ongoing_animations--;
                 end_progress (action);
                 break;
         }
-
-        foreach (var target in targets) {
-            target.propagate (update_type, action, progress);
-        }
-
-        for (var child = get_first_child (); child != null; child = child.get_next_sibling ()) {
-            if (child is ActorTarget) {
-                child.propagate (update_type, action, progress);
-            }
-        }
     }
 
     private void on_child_added (Clutter.Actor child) {

src/Gestures/Gesture.vala

@@ -37,7 +37,6 @@ namespace Gala {
     public enum GestureAction {
         NONE,
         SWITCH_WORKSPACE,
-        MOVE_TO_WORKSPACE,
         SWITCH_WINDOWS,
         MULTITASKING_VIEW,
         DOCK,

src/Gestures/GestureController.vala

@@ -39,10 +39,13 @@ public class Gala.GestureController : Object {
         get { return _target; }
         set {
             _target = value;
-            target.propagate (UPDATE, action, calculate_bounded_progress ());
+            target.propagate (UPDATE, action, progress);
         }
     }
 
+    private Variant? _action_info;
+    public Variant? action_info { get { return _action_info; } }
+
     public double distance { get; construct set; }
     public double overshoot_lower_clamp { get; construct set; default = 0d; }
     public double overshoot_upper_clamp { get; construct set; default = 1d; }
@@ -52,7 +55,7 @@ public class Gala.GestureController : Object {
         get { return _progress; }
         set {
             _progress = value;
-            target.propagate (UPDATE, action, calculate_bounded_progress ());
+            target.propagate (UPDATE, action, value);
         }
     }
 
@@ -71,6 +74,7 @@ public class Gala.GestureController : Object {
     private ScrollBackend? scroll_backend;
 
     private GestureBackend? recognizing_backend;
+    private double gesture_progress;
     private double previous_percentage;
     private uint64 previous_time;
     private double previous_delta;
@@ -83,22 +87,6 @@ public class Gala.GestureController : Object {
         Object (action: action, target: target);
     }
 
-    private double calculate_bounded_progress () {
-        var lower_clamp_int = (int) overshoot_lower_clamp;
-        var upper_clamp_int = (int) overshoot_upper_clamp;
-
-        double stretched_percentage = 0;
-        if (_progress < lower_clamp_int) {
-            stretched_percentage = (_progress - lower_clamp_int) * - (overshoot_lower_clamp - lower_clamp_int);
-        } else if (_progress > upper_clamp_int) {
-            stretched_percentage = (_progress - upper_clamp_int) * (overshoot_upper_clamp - upper_clamp_int);
-        }
-
-        var clamped = _progress.clamp (lower_clamp_int, upper_clamp_int);
-
-        return clamped + stretched_percentage;
-    }
-
     public void enable_touchpad () {
         touchpad_backend = ToucheggBackend.get_default ();
         touchpad_backend.on_gesture_detected.connect (gesture_detected);
@@ -121,11 +109,11 @@ public class Gala.GestureController : Object {
             timeline = null;
         }
 
-        target.propagate (START, action, calculate_bounded_progress ());
+        target.propagate (START, action, progress);
     }
 
     private bool gesture_detected (GestureBackend backend, Gesture gesture, uint32 timestamp) {
-        recognizing = enabled && (GestureSettings.get_action (gesture) == action
+        recognizing = enabled && (GestureSettings.get_action (gesture, out _action_info) == action
             || backend == scroll_backend && GestureSettings.get_action (gesture) == NONE);
 
         if (recognizing) {
@@ -154,6 +142,7 @@ public class Gala.GestureController : Object {
 
         prepare ();
 
+        gesture_progress = progress;
         previous_percentage = percentage;
         previous_time = elapsed_time;
     }
@@ -176,7 +165,7 @@ public class Gala.GestureController : Object {
             }
         }
 
-        progress += calculate_applied_delta (percentage, updated_delta);
+        update_gesture_progress (percentage, updated_delta);
 
         previous_percentage = percentage;
         previous_time = elapsed_time;
@@ -188,7 +177,7 @@ public class Gala.GestureController : Object {
             return;
         }
 
-        progress += calculate_applied_delta (percentage, previous_delta);
+        update_gesture_progress (percentage, previous_delta);
 
         var to = progress;
 
@@ -198,17 +187,32 @@ public class Gala.GestureController : Object {
 
         recognizing = false;
 
-        finish (velocity, Math.round (to));
+        finish (velocity * direction_multiplier, Math.round (to));
 
+        gesture_progress = 0;
         previous_percentage = 0;
         previous_time = 0;
         previous_delta = 0;
         velocity = 0;
         direction_multiplier = 0;
     }
 
-    private inline double calculate_applied_delta (double percentage, double percentage_delta) {
-        return ((percentage - percentage_delta) - (previous_percentage - previous_delta)) * direction_multiplier;
+    private void update_gesture_progress (double percentage, double percentage_delta) {
+        gesture_progress += ((percentage - percentage_delta) - (previous_percentage - previous_delta)) * direction_multiplier;
+
+        var lower_clamp_int = (int) overshoot_lower_clamp;
+        var upper_clamp_int = (int) overshoot_upper_clamp;
+
+        double stretched_percentage = 0;
+        if (gesture_progress < lower_clamp_int) {
+            stretched_percentage = (gesture_progress - lower_clamp_int) * - (overshoot_lower_clamp - lower_clamp_int);
+        } else if (gesture_progress > upper_clamp_int) {
+            stretched_percentage = (gesture_progress - upper_clamp_int) * (overshoot_upper_clamp - upper_clamp_int);
+        }
+
+        var clamped = gesture_progress.clamp (lower_clamp_int, upper_clamp_int);
+
+        progress = clamped + stretched_percentage;
     }
 
     private void finish (double velocity, double to) {
@@ -217,26 +221,32 @@ public class Gala.GestureController : Object {
         target.propagate (COMMIT, action, clamped_to);
 
         if (progress == to) {
-            target.propagate (END, action, calculate_bounded_progress ());
+            finished ();
             return;
         }
 
         if (!AnimationsSettings.get_enable_animations ()) {
             progress = clamped_to;
-            target.propagate (END, action, calculate_bounded_progress ());
+            finished ();
             return;
         }
 
         var spring = new SpringTimeline (target.actor, progress, clamped_to, velocity, 1, 1, 1000);
         spring.progress.connect ((value) => progress = value);
-        spring.stopped.connect (() => {
-            target.propagate (END, action, calculate_bounded_progress ());
-            timeline = null;
-        });
+        spring.stopped.connect_after (finished);
 
         timeline = spring;
     }
 
+    private void finished (bool is_finished = true) {
+        target.propagate (END, action, progress);
+        timeline = null;
+
+        if (is_finished) {
+            _action_info = null;
+        }
+    }
+
     /**
      * Animates to the given progress value.
      * If the gesture is currently recognizing, it will do nothing.
@@ -249,7 +259,7 @@ public class Gala.GestureController : Object {
         }
 
         prepare ();
-        finish (0.005, to);
+        finish ((to > progress ? 1 : -1) * 5, to);
     }
 
     public void cancel_gesture () {

src/Gestures/GestureSettings.vala

@@ -70,7 +70,9 @@ public class Gala.GestureSettings : Object {
         return gala_settings.get_string (setting_id);
     }
 
-    public static GestureAction get_action (Gesture gesture) {
+    public static GestureAction get_action (Gesture gesture, out Variant? action_info = null) {
+        action_info = null;
+
         if (gesture.type == TOUCHPAD_SWIPE) {
             var fingers = gesture.fingers;
 
@@ -85,7 +87,8 @@ public class Gala.GestureSettings : Object {
 
                 if (fingers == 3 && three_finger_swipe_horizontal == "move-to-workspace" ||
                     fingers == 4 && four_finger_swipe_horizontal == "move-to-workspace") {
-                    return MOVE_TO_WORKSPACE;
+                    action_info = true;
+                    return SWITCH_WORKSPACE;
                 }