From 98b52c73f0b9dcc7187350809d710f8c075483d1 Mon Sep 17 00:00:00 2001 From: Emmanuel Hansen Date: Mon, 30 Jan 2023 13:53:29 +0000 Subject: [PATCH] only set pointer events to handled in button if click is triggered --- src/Avalonia.Controls/Button.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs index 1ec6f8dabc..9627f200df 100644 --- a/src/Avalonia.Controls/Button.cs +++ b/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(); } }