From c8c96f57a36d63502e6b78191060eec480d60b70 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 28 Jan 2020 14:41:34 +0100 Subject: [PATCH 1/2] Make test fail for #3325 --- tests/Avalonia.Input.UnitTests/GesturesTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Avalonia.Input.UnitTests/GesturesTests.cs b/tests/Avalonia.Input.UnitTests/GesturesTests.cs index 39c219a773..ffa03f9e8e 100644 --- a/tests/Avalonia.Input.UnitTests/GesturesTests.cs +++ b/tests/Avalonia.Input.UnitTests/GesturesTests.cs @@ -135,7 +135,7 @@ namespace Avalonia.Interactivity.UnitTests } [Fact] - public void DoubleTapped_Should_Be_Raised_For_Middle_Button() + public void DoubleTapped_Should_Not_Be_Raised_For_Middle_Button() { Border border = new Border(); var decorator = new Decorator @@ -149,7 +149,7 @@ namespace Avalonia.Interactivity.UnitTests _mouse.Click(border, MouseButton.Middle); _mouse.Down(border, MouseButton.Middle, clickCount: 2); - Assert.True(raised); + Assert.False(raised); } [Fact] From 3cc59007b0007dcf0d9a48656fe555265d3cb65c Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 28 Jan 2020 14:42:06 +0100 Subject: [PATCH 2/2] Only fire DoubleTapped on left button press. Fixes #3325 --- src/Avalonia.Input/Gestures.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Avalonia.Input/Gestures.cs b/src/Avalonia.Input/Gestures.cs index a5bd4feb64..a656d08c16 100644 --- a/src/Avalonia.Input/Gestures.cs +++ b/src/Avalonia.Input/Gestures.cs @@ -79,7 +79,7 @@ namespace Avalonia.Input { s_lastPress = new WeakReference(e.Source); } - else if (s_lastPress != null && e.ClickCount == 2 && e.MouseButton != MouseButton.Right) + else if (s_lastPress != null && e.ClickCount == 2 && e.MouseButton == MouseButton.Left) { if (s_lastPress.TryGetTarget(out var target) && target == e.Source) {