Browse Source

Merge pull request #10133 from AvaloniaUI/button_click

Only set pointer events to handled in button if click is triggered
Max Katz 2 years ago
parent
commit
4d92a2721b
1 changed files with 2 additions and 2 deletions
  1. 2 2
      src/Avalonia.Controls/Button.cs

+ 2 - 2
src/Avalonia.Controls/Button.cs

@@ -394,10 +394,10 @@ namespace Avalonia.Controls
             if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
                 IsPressed = true;
-                e.Handled = true;
 
                 if (ClickMode == ClickMode.Press)
                 {
+                    e.Handled = true;
                     OnClick();
                 }
             }
@@ -411,11 +411,11 @@ namespace Avalonia.Controls
             if (IsPressed && e.InitialPressMouseButton == MouseButton.Left)
             {
                 IsPressed = false;
-                e.Handled = true;
 
                 if (ClickMode == ClickMode.Release &&
                     this.GetVisualsAt(e.GetPosition(this)).Any(c => this == c || this.IsVisualAncestorOf(c)))
                 {
+                    e.Handled = true;
                     OnClick();
                 }
             }