From a893297bc85785b2200c211386dc99b0bb58f65f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Tue, 18 Aug 2020 01:51:30 +0100
Subject: [PATCH 1/2] Fire Tapped only on left button click.

---
 src/Avalonia.Input/Gestures.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Input/Gestures.cs b/src/Avalonia.Input/Gestures.cs
index 0efc20b196..cdfcd94692 100644
--- a/src/Avalonia.Input/Gestures.cs
+++ b/src/Avalonia.Input/Gestures.cs
@@ -96,8 +96,11 @@ namespace Avalonia.Input
 
                 if (s_lastPress.TryGetTarget(out var target) && target == e.Source)
                 {
-                    var et = e.InitialPressMouseButton != MouseButton.Right ? TappedEvent : RightTappedEvent;
-                    e.Source.RaiseEvent(new RoutedEventArgs(et));
+                    if (e.InitialPressMouseButton == MouseButton.Left || e.InitialPressMouseButton == MouseButton.Right)
+                    {
+                        var et = e.InitialPressMouseButton != MouseButton.Right ? TappedEvent : RightTappedEvent;
+                        e.Source.RaiseEvent(new RoutedEventArgs(et));
+                    }
                 }
             }
         }

From 8c25848d5508e8e67b279cc804936208bc50262f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Thu, 20 Aug 2020 21:38:12 +0100
Subject: [PATCH 2/2] Fixed test.

---
 tests/Avalonia.Input.UnitTests/GesturesTests.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/Avalonia.Input.UnitTests/GesturesTests.cs b/tests/Avalonia.Input.UnitTests/GesturesTests.cs
index eb930621ab..b2687c2555 100644
--- a/tests/Avalonia.Input.UnitTests/GesturesTests.cs
+++ b/tests/Avalonia.Input.UnitTests/GesturesTests.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 using Avalonia.Controls;
-using Avalonia.Input;
 using Avalonia.UnitTests;
 using Xunit;
 
-namespace Avalonia.Interactivity.UnitTests
+namespace Avalonia.Input.UnitTests
 {
     public class GesturesTests
     {
@@ -45,7 +44,7 @@ namespace Avalonia.Interactivity.UnitTests
         }
 
         [Fact]
-        public void Tapped_Should_Be_Raised_For_Middle_Button()
+        public void Tapped_Should_Not_Be_Raised_For_Middle_Button()
         {
             Border border = new Border();
             var decorator = new Decorator
@@ -58,7 +57,7 @@ namespace Avalonia.Interactivity.UnitTests
 
             _mouse.Click(border, MouseButton.Middle);
 
-            Assert.True(raised);
+            Assert.False(raised);
         }
 
         [Fact]