Add method to cancel currently ongoing gesture on a pointer (#13351)

* add method to cancel currently ongoing gesture on a pointer * skip gesture recognition for pointer capture session, revert cancel gesture changes
AvaloniaUI · Oct 26, 2023 · fcea345 · fcea345
1 parent c7e9651
commit fcea345
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/Avalonia.Base/Input/Pointer.cs b/src/Avalonia.Base/Input/Pointer.cs
@@ -56,6 +56,11 @@ public void Capture(IInputElement? control)
 
             if (Captured != null)
                 CaptureGestureRecognizer(null);
+
+            if(Captured == null && CapturedGestureRecognizer == null)
+            {
+                IsGestureRecognitionSkipped = false;
+            }
         }
 
         static IInputElement? GetNextCapture(Visual parent)
@@ -79,6 +84,8 @@ private void OnCaptureDetached(object? sender, VisualTreeAttachmentEventArgs e)
         /// </summary>
         internal GestureRecognizer? CapturedGestureRecognizer { get; private set; }
 
+        public bool IsGestureRecognitionSkipped { get; set; }
+
         public void Dispose()
         {
             Capture(null);

diff --git a/src/Avalonia.Base/Input/PointerEventArgs.cs b/src/Avalonia.Base/Input/PointerEventArgs.cs
@@ -58,7 +58,18 @@ public class PointerEventArgs : RoutedEventArgs
         /// </summary>
         public ulong Timestamp { get; }
 
-        internal bool IsGestureRecognitionSkipped { get; private set; }
+        internal bool IsGestureRecognitionSkipped
+        {
+            get
+            {
+                return (Pointer as Pointer)?.IsGestureRecognitionSkipped ?? false;
+            }
+            private set
+            {
+                if (Pointer is Pointer pointer)
+                    pointer.IsGestureRecognitionSkipped = true;
+            }
+        }
 
         /// <summary>
         /// Gets a value that indicates which key modifiers were active at the time that the pointer event was initiated.