fix double context request from hold gesture (AvaloniaUI#13948)

jcyuan · Dec 14, 2023 · 7fe2747 · 7fe2747
1 parent 9bc1ed6
commit 7fe2747
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
@@ -380,10 +380,13 @@ protected sealed override void OnAttachedToVisualTreeCore(VisualTreeAttachmentEv
 
         private void OnHoldEvent(object? sender, HoldingRoutedEventArgs e)
         {
-            if (!e.Handled && e.HoldingState == HoldingState.Started)
+            if (e.Source == this && !e.Handled && e.HoldingState == HoldingState.Started)
             {
                 // Trigger ContentRequest when hold has started
-                RaiseEvent(e.PointerEventArgs is { } ev ? new ContextRequestedEventArgs(ev) : new ContextRequestedEventArgs());
+                var contextEvent = e.PointerEventArgs is { } ev ? new ContextRequestedEventArgs(ev) : new ContextRequestedEventArgs();
+                RaiseEvent(contextEvent);
+
+                e.Handled = contextEvent.Handled;
             }
         }