Merge branch 'main' into leolost/gesture-controller-test-finalize

Author: leolost2605

lib/Gestures/GestureController.vala

@@ -287,9 +287,9 @@ public class Gala.GestureController : Object {
 
     private void finished () {
         assert (running);
-        target.propagate (END, action, progress);
         running = false;
         remove_timeline ();
+        target.propagate (END, action, progress);
     }
 
     private void remove_timeline () {
@@ -319,6 +319,18 @@ public class Gala.GestureController : Object {
         finish ((to > progress ? 1 : -1) * 1, to);
     }
 
+    public void jump (double to) {
+        if (running && !recognizing) {
+            /* We are animating to a snap point so stop the animation */
+            finished ();
+        }
+
+        var clamped_to = to.clamp ((int) overshoot_lower_clamp, (int) overshoot_upper_clamp);
+
+        target?.propagate (COMMIT, action, clamped_to);
+        progress = clamped_to;
+    }
+
     public void cancel_gesture () {
         if (recognizing) {
             recognizing_backend.cancel_gesture ();

src/Widgets/MultitaskingView/MultitaskingView.vala

@@ -92,6 +92,7 @@ public class Gala.MultitaskingView : Root, RootTarget, ActivatableComponent {
         add_child (StaticWindowContainer.get_instance (display));
 
         unowned var manager = display.get_workspace_manager ();
+        manager.workspace_added.connect (sync_active_workspace);
         manager.workspace_removed.connect (sync_active_workspace);
         manager.workspaces_reordered.connect (sync_active_workspace);
         manager.workspace_switched.connect (on_workspace_switched);
@@ -302,8 +303,12 @@ public class Gala.MultitaskingView : Root, RootTarget, ActivatableComponent {
     }
 
     private void sync_active_workspace () {
-        unowned var manager = display.get_workspace_manager ();
-        workspaces_gesture_controller.progress = -manager.get_active_workspace_index ();
+        if (workspaces_gesture_controller.recognizing) {
+            return;
+        }
+
+        var target = -display.get_workspace_manager ().get_active_workspace_index ();
+        workspaces_gesture_controller.jump (target);
     }
 
     private void on_workspace_switched (int from, int to) {