prevent gesture recognition when gesture is captured (#13323)

AvaloniaUI · Dec 5, 2023 · 6794148 · 6794148
1 parent 57f7622
commit 6794148
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/Avalonia.Base/Input/GestureRecognizers/GestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/GestureRecognizer.cs
@@ -2,6 +2,7 @@
 {
     public abstract class GestureRecognizer : StyledElement
     {
+        private PointerEventArgs? _currentPointerEventArgs;
         protected internal IInputElement? Target { get; internal set; }
 
         protected abstract void PointerPressed(PointerPressedEventArgs e);
@@ -11,17 +12,23 @@ public abstract class GestureRecognizer : StyledElement
 
         internal void PointerPressedInternal(PointerPressedEventArgs e)
         {
+            _currentPointerEventArgs = e;
             PointerPressed(e);
+            _currentPointerEventArgs = null;
         }
 
         internal void PointerReleasedInternal(PointerReleasedEventArgs e)
         {
+            _currentPointerEventArgs = e;
             PointerReleased(e);
+            _currentPointerEventArgs = null;
         }
 
         internal void PointerMovedInternal(PointerEventArgs e)
         {
+            _currentPointerEventArgs = e;
             PointerMoved(e);
+            _currentPointerEventArgs = null;
         }
 
         internal void PointerCaptureLostInternal(IPointer pointer)
@@ -32,6 +39,8 @@ internal void PointerCaptureLostInternal(IPointer pointer)
         protected void Capture(IPointer pointer)
         {
             (pointer as Pointer)?.CaptureGestureRecognizer(this);
+
+            _currentPointerEventArgs?.PreventGestureRecognition();
         }
     }
 }
diff --git a/src/Avalonia.Base/Input/GestureRecognizers/PullGestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/PullGestureRecognizer.cs
@@ -44,7 +44,6 @@ protected override void PointerMoved(PointerEventArgs e)
             {
                 var currentPosition = e.GetPosition(visual);
                 Capture(e.Pointer);
-                e.PreventGestureRecognition();
 
                 Vector delta = default;
                 switch (PullDirection)

diff --git a/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs
@@ -124,8 +124,6 @@ protected override void PointerMoved(PointerEventArgs e)
                             _trackedRootPoint.Y - (_trackedRootPoint.Y >= rootPoint.Y ? ScrollStartDistance : -ScrollStartDistance));
 
                         Capture(e.Pointer);
-
-                        e.PreventGestureRecognition();
                     }
                 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -124,8 +124,6 @@ protected override void PointerMoved(PointerEventArgs e) @@
                                 _trackedRootPoint.Y - (_trackedRootPoint.Y >= rootPoint.Y ? ScrollStartDistance : -ScrollStartDistance));
                             Capture(e.Pointer);
-                            e.PreventGestureRecognition();
                         }
                     }
@@ Expand Down @@