Take initial percentage as on_gesture_handled return

Author: leolost2605

src/Gestures/GestureTracker.vala

@@ -95,8 +95,10 @@ public class Gala.GestureTracker : Object {
      * start receiving updates.
      * @param gesture the same gesture as in {@link on_gesture_detected}
      * @param timestamp the timestamp of the event that initiated the gesture or {@link Meta.CURRENT_TIME}.
+     * @return the initial percentage that should already be preapplied. This is useful
+     * if an animation was still ongoing when the gesture was started.
      */
-    public signal void on_gesture_handled (Gesture gesture, uint32 timestamp);
+    public signal double on_gesture_handled (Gesture gesture, uint32 timestamp);
 
     /**
      * Emitted right after on_gesture_detected with the initial gesture information.
@@ -123,17 +125,6 @@ public class Gala.GestureTracker : Object {
     public delegate void OnUpdate (double percentage);
     public delegate void OnEnd (double percentage, int completions, int calculated_duration);
 
-    public double initial_percentage {
-        set {
-            if (applied_percentage != 0) {
-                critical ("Gesture has already started and is in progress.");
-                return;
-            }
-
-            applied_percentage = value;
-        }
-    }
-
     /**
      * Backend used if enable_touchpad is called.
      */
@@ -261,7 +252,7 @@ public class Gala.GestureTracker : Object {
     private bool gesture_detected (GestureBackend backend, Gesture gesture, uint32 timestamp) {
         if (enabled && on_gesture_detected (gesture)) {
             backend.prepare_gesture_handling ();
-            on_gesture_handled (gesture, timestamp);
+            applied_percentage = on_gesture_handled (gesture, timestamp);
             return true;
         }
 

src/Widgets/MultitaskingView.vala

@@ -66,7 +66,7 @@ namespace Gala {
             multitasking_gesture_tracker = new GestureTracker (ANIMATION_DURATION, ANIMATION_DURATION);
             multitasking_gesture_tracker.enable_touchpad ();
             multitasking_gesture_tracker.on_gesture_detected.connect (on_multitasking_gesture_detected);
-            multitasking_gesture_tracker.on_gesture_handled.connect (() => toggle (true, false));
+            multitasking_gesture_tracker.on_gesture_handled.connect (on_multitasking_gesture_handled);
 
             workspace_gesture_tracker = new GestureTracker (AnimationDuration.WORKSPACE_SWITCH_MIN, AnimationDuration.WORKSPACE_SWITCH);
             workspace_gesture_tracker.enable_touchpad ();
@@ -299,6 +299,11 @@ namespace Gala {
             return false;
         }
 
+        private double on_multitasking_gesture_handled (Gesture gesture, uint32 timestamp) {
+            toggle (true, false);
+            return 0;
+        }
+
         private bool on_workspace_gesture_detected (Gesture gesture) {
             if (!opened) {
                 return false;
@@ -311,7 +316,7 @@ namespace Gala {
             return false;
         }
 
-        private void switch_workspace_with_gesture (Gesture gesture, uint32 timestamp) {
+        private double switch_workspace_with_gesture (Gesture gesture, uint32 timestamp) {
             var direction = workspace_gesture_tracker.settings.get_natural_scroll_direction (gesture);
 
             unowned var manager = display.get_workspace_manager ();
@@ -355,7 +360,7 @@ namespace Gala {
             var upper_clamp = (direction == LEFT) ? (active_workspace.index () + 0.1) : (num_workspaces - active_workspace.index () - 0.9);
             var lower_clamp = (direction == RIGHT) ? - (active_workspace.index () + 0.1) : - (num_workspaces - active_workspace.index () - 0.9);
 
-            workspace_gesture_tracker.initial_percentage = new GesturePropertyTransition (workspaces, workspace_gesture_tracker, "x", null, target_x) {
+            var initial_percentage = new GesturePropertyTransition (workspaces, workspace_gesture_tracker, "x", null, target_x) {
                 overshoot_lower_clamp = lower_clamp,
                 overshoot_upper_clamp = upper_clamp
             }.start (true);
@@ -372,6 +377,8 @@ namespace Gala {
             } else {
                 workspace_gesture_tracker.connect_handlers (null, null, (owned) on_animation_end);
             }
+
+            return initial_percentage;
         }
 
         /**

src/WindowManager.vala

@@ -585,7 +585,7 @@ namespace Gala {
             return switch_workspace_with_gesture || (action == SWITCH_WINDOWS && !window_switcher.opened);
         }
 
-        private void on_gesture_handled (Gesture gesture, uint32 timestamp) {
+        private double on_gesture_handled (Gesture gesture, uint32 timestamp) {
             var direction = gesture_tracker.settings.get_natural_scroll_direction (gesture);
 
             switch (GestureSettings.get_action (gesture)) {
@@ -609,6 +609,8 @@ namespace Gala {
                 default:
                     break;
             }
+
+            return 0;
         }
 
         /**

src/Zoom.vala

@@ -33,7 +33,7 @@ public class Gala.Zoom : Object {
         gesture_tracker = new GestureTracker (ANIMATION_DURATION, ANIMATION_DURATION);
         gesture_tracker.enable_touchpad ();
         gesture_tracker.on_gesture_detected.connect (on_gesture_detected);
-        gesture_tracker.on_gesture_handled.connect ((gesture) => zoom_with_gesture (gesture.direction));
+        gesture_tracker.on_gesture_handled.connect (on_gesture_handled);
 
         behavior_settings = new GLib.Settings ("io.elementary.desktop.wm.behavior");
 
@@ -101,9 +101,9 @@ public class Gala.Zoom : Object {
         return Clutter.EVENT_STOP;
     }
 
-    private void zoom_with_gesture (GestureDirection direction) {
+    private double on_gesture_handled (Gesture gesture, uint32 timestamp) {
         var initial_zoom = current_zoom;
-        var target_zoom = (direction == GestureDirection.IN)
+        var target_zoom = (gesture.direction == GestureDirection.IN)
             ? initial_zoom - MAX_ZOOM
             : initial_zoom + MAX_ZOOM;
 
@@ -123,6 +123,8 @@ public class Gala.Zoom : Object {
         };
 
         gesture_tracker.connect_handlers (null, (owned) on_animation_update, null);
+
+        return 0;
     }
 
     private inline Graphene.Point compute_new_pivot_point () {