From 80b0c3d54c8247a6b87170a2b288e86e8cb42838 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 3 Nov 2022 00:24:17 +0100
Subject: [PATCH 01/13] Allow AccessibilityView to override peer.

Setting `AutomationProperties.AccessibilityView` can now override the `IsControlElementCore` and `IsContentElementCore` settings returned from the automation peer.
---
 .../Automation/AutomationProperties.cs           |  8 ++++++--
 .../Automation/Peers/AutomationPeer.cs           | 14 ++++++++++++--
 .../Automation/Peers/ControlAutomationPeer.cs    | 16 ++++++++++++++--
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Controls/Automation/AutomationProperties.cs b/src/Avalonia.Controls/Automation/AutomationProperties.cs
index c20af148b8..a192ef6420 100644
--- a/src/Avalonia.Controls/Automation/AutomationProperties.cs
+++ b/src/Avalonia.Controls/Automation/AutomationProperties.cs
@@ -9,6 +9,11 @@ namespace Avalonia.Automation
     /// </summary>
     public enum AccessibilityView
     {
+        /// <summary>
+        /// The control's view is defined by its automation peer.
+        /// </summary>
+        Default,
+
         /// <summary>
         /// The control is included in the Raw view of the automation tree.
         /// </summary>
@@ -44,8 +49,7 @@ namespace Avalonia.Automation
         public static readonly AttachedProperty<AccessibilityView> AccessibilityViewProperty =
             AvaloniaProperty.RegisterAttached<StyledElement, AccessibilityView>(
                 "AccessibilityView",
-                typeof(AutomationProperties),
-                defaultValue: AccessibilityView.Content);
+                typeof(AutomationProperties));
 
         /// <summary>
         /// Defines the AutomationProperties.AccessKey attached property
diff --git a/src/Avalonia.Controls/Automation/Peers/AutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/AutomationPeer.cs
index 71421ac136..3d3fe35d29 100644
--- a/src/Avalonia.Controls/Automation/Peers/AutomationPeer.cs
+++ b/src/Avalonia.Controls/Automation/Peers/AutomationPeer.cs
@@ -128,13 +128,13 @@ namespace Avalonia.Automation.Peers
         /// Gets a value that indicates whether the element that is associated with this automation
         /// peer contains data that is presented to the user.
         /// </summary>
-        public bool IsContentElement() => IsControlElement() && IsContentElementCore();
+        public bool IsContentElement() => IsContentElementOverrideCore();
 
         /// <summary>
         /// Gets a value that indicates whether the element is understood by the user as
         /// interactive or as contributing to the logical structure of the control in the GUI.
         /// </summary>
-        public bool IsControlElement() => IsControlElementCore();
+        public bool IsControlElement() => IsControlElementOverrideCore();
 
         /// <summary>
         /// Gets a value indicating whether the control is enabled for user interaction.
@@ -247,6 +247,16 @@ namespace Avalonia.Automation.Peers
             return GetAutomationControlTypeCore();
         }
 
+        protected virtual bool IsContentElementOverrideCore()
+        {
+            return IsControlElement() && IsContentElementCore();
+        }
+
+        protected virtual bool IsControlElementOverrideCore()
+        {
+            return IsControlElementCore();
+        }
+
         protected virtual object? GetProviderCore(Type providerType)
         {
             return providerType.IsAssignableFrom(this.GetType()) ? this : null;
diff --git a/src/Avalonia.Controls/Automation/Peers/ControlAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/ControlAutomationPeer.cs
index a93d3fa7dd..25172b2d1c 100644
--- a/src/Avalonia.Controls/Automation/Peers/ControlAutomationPeer.cs
+++ b/src/Avalonia.Controls/Automation/Peers/ControlAutomationPeer.cs
@@ -149,8 +149,8 @@ namespace Avalonia.Automation.Peers
         protected override Rect GetBoundingRectangleCore() => GetBounds(Owner);
         protected override string GetClassNameCore() => Owner.GetType().Name;
         protected override bool HasKeyboardFocusCore() => Owner.IsFocused;
-        protected override bool IsContentElementCore() => AutomationProperties.GetAccessibilityView(Owner) >= AccessibilityView.Content;
-        protected override bool IsControlElementCore() => AutomationProperties.GetAccessibilityView(Owner) >= AccessibilityView.Control;
+        protected override bool IsContentElementCore() => true;
+        protected override bool IsControlElementCore() => true;
         protected override bool IsEnabledCore() => Owner.IsEnabled;
         protected override bool IsKeyboardFocusableCore() => Owner.Focusable;
         protected override void SetFocusCore() => Owner.Focus();
@@ -160,6 +160,18 @@ namespace Avalonia.Automation.Peers
             return AutomationProperties.GetControlTypeOverride(Owner) ?? GetAutomationControlTypeCore();
         }
 
+        protected override bool IsContentElementOverrideCore()
+        {
+            var view = AutomationProperties.GetAccessibilityView(Owner);
+            return view == AccessibilityView.Default ? IsContentElementCore() : view >= AccessibilityView.Content;
+        }
+
+        protected override bool IsControlElementOverrideCore()
+        {
+            var view = AutomationProperties.GetAccessibilityView(Owner);
+            return view == AccessibilityView.Default ? IsControlElementCore() : view >= AccessibilityView.Control;
+        }
+
         private static Rect GetBounds(Control control)
         {
             var root = control.GetVisualRoot();

From 9a50b9ee0ccab7d96bac6e144c55aa0422303f02 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 3 Nov 2022 15:36:02 +0100
Subject: [PATCH 02/13] Added integration tests for tapped gestures.

Some skipped on Windows as right button actions aren't supported by WinAppDriver.
---
 samples/IntegrationTestApp/MainWindow.axaml   |  12 ++
 .../IntegrationTestApp/MainWindow.axaml.cs    |  10 ++
 .../GestureTests.cs                           | 151 ++++++++++++++++++
 3 files changed, 173 insertions(+)
 create mode 100644 tests/Avalonia.IntegrationTests.Appium/GestureTests.cs

diff --git a/samples/IntegrationTestApp/MainWindow.axaml b/samples/IntegrationTestApp/MainWindow.axaml
index 3377979199..2a0a758852 100644
--- a/samples/IntegrationTestApp/MainWindow.axaml
+++ b/samples/IntegrationTestApp/MainWindow.axaml
@@ -69,6 +69,18 @@
         </StackPanel>
       </TabItem>
 
+      <TabItem Header="Gestures">
+        <DockPanel>
+          <DockPanel DockPanel.Dock="Top">
+            <Button Name="ClearLastGesture" DockPanel.Dock="Right">Clear</Button>
+            <TextBlock Name="LastGesture" />
+          </DockPanel>
+          <Border Name="GestureBorder" Background="Blue" 
+                  AutomationProperties.AccessibilityView="Content"
+                  AutomationProperties.ControlTypeOverride="Image"/>
+        </DockPanel>
+      </TabItem>
+
       <TabItem Header="ListBox">
         <DockPanel>
           <StackPanel DockPanel.Dock="Bottom">
diff --git a/samples/IntegrationTestApp/MainWindow.axaml.cs b/samples/IntegrationTestApp/MainWindow.axaml.cs
index f72f83fcb8..791e221d50 100644
--- a/samples/IntegrationTestApp/MainWindow.axaml.cs
+++ b/samples/IntegrationTestApp/MainWindow.axaml.cs
@@ -4,6 +4,7 @@ using Avalonia;
 using Avalonia.Automation;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using Avalonia.VisualTree;
@@ -20,6 +21,15 @@ namespace IntegrationTestApp
             this.AttachDevTools();
             AddHandler(Button.ClickEvent, OnButtonClick);
             ListBoxItems = Enumerable.Range(0, 100).Select(x => "Item " + x).ToList();
+            
+            var gestureBorder = this.GetControl<Border>("GestureBorder");
+            var lastGesture = this.GetControl<TextBlock>("LastGesture");
+            var clearLastGesture = this.GetControl<Button>("ClearLastGesture");
+            gestureBorder.Tapped += (s, e) => lastGesture.Text = "Tapped";
+            gestureBorder.DoubleTapped += (s, e) => lastGesture.Text = "DoubleTapped";
+            Gestures.AddRightTappedHandler(gestureBorder, (s, e) => lastGesture.Text = "RightTapped");
+            clearLastGesture.Click += (s, e) => lastGesture.Text = string.Empty;
+            
             DataContext = this;
         }
 
diff --git a/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs b/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs
new file mode 100644
index 0000000000..61d8ea1df6
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs
@@ -0,0 +1,151 @@
+using System;
+using System.Threading;
+using OpenQA.Selenium.Appium;
+using OpenQA.Selenium.Interactions;
+using Xunit;
+
+namespace Avalonia.IntegrationTests.Appium
+{
+    [Collection("Default")]
+    public class GestureTests
+    {
+        private readonly AppiumDriver<AppiumWebElement> _session;
+
+        public GestureTests(TestAppFixture fixture)
+        {
+            _session = fixture.Session;
+
+            var tabs = _session.FindElementByAccessibilityId("MainTabs");
+            var tab = tabs.FindElementByName("Gestures");
+            tab.Click();
+            var clear = _session.FindElementByAccessibilityId("ClearLastGesture");
+            clear.Click();
+        }
+
+        [Fact]
+        public void Tapped_Is_Raised()
+        {
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+
+            new Actions(_session).Click(border).Perform();
+
+            Assert.Equal("Tapped", lastGesture.Text);
+        }
+
+        [Fact]
+        public void Tapped_Is_Raised_Slow()
+        {
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+
+            new Actions(_session).ClickAndHold(border).Perform();
+
+            Thread.Sleep(2000);
+
+            new Actions(_session).Release(border).Perform();
+
+            Assert.Equal("Tapped", lastGesture.Text);
+        }
+
+        [Fact]
+        public void Tapped_Is_Not_Raised_For_Drag()
+        {
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+
+            new Actions(_session)
+                .ClickAndHold(border)
+                .MoveByOffset(50, 50)
+                .Release()
+                .Perform();
+
+            Assert.Equal(string.Empty, lastGesture.Text);
+        }
+
+        [Fact]
+        public void DoubleTapped_Is_Raised()
+        {
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+
+            new Actions(_session).DoubleClick(border).Perform();
+
+            Assert.Equal("DoubleTapped", lastGesture.Text);
+        }
+
+        [Fact]
+        public void DoubleTapped_Is_Raised_2()
+        {
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+
+            new Actions(_session).ClickAndHold(border).Release().Perform();
+
+            Thread.Sleep(100);
+
+            new Actions(_session).ClickAndHold(border).Release().Perform();
+
+            Assert.Equal("DoubleTapped", lastGesture.Text);
+        }
+
+        [Fact]
+        public void DoubleTapped_Is_Raised_Not_Raised_If_Too_Slow()
+        {
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+
+            new Actions(_session).ClickAndHold(border).Release().Perform();
+
+            Thread.Sleep(2000);
+
+            new Actions(_session).ClickAndHold(border).Release().Perform();
+
+            Assert.Equal("Tapped", lastGesture.Text);
+        }
+
+        [Fact]
+        public void RightTapped_Is_Raised()
+        {
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+
+            new Actions(_session).ContextClick(border).Perform();
+
+            Assert.Equal("RightTapped", lastGesture.Text);
+        }
+
+        [PlatformFact(TestPlatforms.MacOS)]
+        public void RightTapped_Is_Raised_2()
+        {
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+            var device = new PointerInputDevice(PointerKind.Mouse);
+            var b = new ActionBuilder();
+
+            b.AddAction(device.CreatePointerMove(border, 50, 50, TimeSpan.FromMilliseconds(100)));
+            b.AddAction(device.CreatePointerDown(MouseButton.Right));
+            b.AddAction(device.CreatePointerMove(border, 2, 2, TimeSpan.FromMilliseconds(100)));
+            b.AddAction(device.CreatePointerUp(MouseButton.Right));
+            _session.PerformActions(b.ToActionSequenceList());
+
+            Assert.Equal("RightTapped", lastGesture.Text);
+        }
+
+        [PlatformFact(TestPlatforms.MacOS)]
+        public void RightTapped_Is_Not_Raised_For_Drag()
+        {
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+            var device = new PointerInputDevice(PointerKind.Mouse);
+            var b = new ActionBuilder();
+
+            b.AddAction(device.CreatePointerMove(border, 50, 50, TimeSpan.FromMilliseconds(100)));
+            b.AddAction(device.CreatePointerDown(MouseButton.Right));
+            b.AddAction(device.CreatePointerMove(CoordinateOrigin.Pointer, 50, 50, TimeSpan.FromMilliseconds(100)));
+            b.AddAction(device.CreatePointerUp(MouseButton.Right));
+
+            Assert.Equal(string.Empty, lastGesture.Text);
+        }
+    }
+}

From d9bee81505e7ad670cab61721839046fbf86fc43 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 3 Nov 2022 22:56:40 +0100
Subject: [PATCH 03/13] Don't register drag as tap.

---
 src/Avalonia.Base/Input/Gestures.cs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Base/Input/Gestures.cs b/src/Avalonia.Base/Input/Gestures.cs
index 4349fca7db..d50abaa4b9 100644
--- a/src/Avalonia.Base/Input/Gestures.cs
+++ b/src/Avalonia.Base/Input/Gestures.cs
@@ -42,9 +42,8 @@ namespace Avalonia.Input
             RoutedEvent.Register<PointerDeltaEventArgs>(
                 "PointerSwipeGesture", RoutingStrategies.Bubble, typeof(Gestures));
 
-#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
-        private static readonly WeakReference<IInteractive> s_lastPress = new WeakReference<IInteractive>(null);
-#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+        private static readonly WeakReference<IInteractive?> s_lastPress = new WeakReference<IInteractive?>(null);
+        private static Point s_lastPressPoint;
 
         static Gestures()
         {
@@ -98,6 +97,7 @@ namespace Avalonia.Input
                 {
                     s_isDoubleTapped = false;
                     s_lastPress.SetTarget(ev.Source);
+                    s_lastPressPoint = e.GetPosition((IVisual)ev.Source);
                 }
                 else if (e.ClickCount % 2 == 0 && e.GetCurrentPoint(visual).Properties.IsLeftButtonPressed)
                 {
@@ -120,9 +120,16 @@ namespace Avalonia.Input
             {
                 var e = (PointerReleasedEventArgs)ev;
 
-                if (s_lastPress.TryGetTarget(out var target) && target == e.Source)
+                if (s_lastPress.TryGetTarget(out var target) && 
+                    target == e.Source &&
+                    e.InitialPressMouseButton is MouseButton.Left or MouseButton.Right)
                 {
-                    if (e.InitialPressMouseButton == MouseButton.Left || e.InitialPressMouseButton == MouseButton.Right)
+                    var point = e.GetCurrentPoint((IVisual)target);
+                    var tapSize = new Size(4, 4);
+                    var tapRect = new Rect(s_lastPressPoint, new Size())
+                        .Inflate(new Thickness(tapSize.Width, tapSize.Height));
+
+                    if (tapRect.ContainsExclusive(point.Position))
                     {
                         if (e.InitialPressMouseButton == MouseButton.Right)
                         {

From d0eb38b6ba45b4b9855ce5bb3829bd22d88d78ab Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 3 Nov 2022 23:01:22 +0100
Subject: [PATCH 04/13] Add Tap size to IPlatformSettings.

And refactor that interface while we're at it. Also add a `DefaultPlatformSettings` implementation instead of implementing it in each backend with slightly different values.
---
 src/Avalonia.Base/Input/Gestures.cs           |  4 ++-
 src/Avalonia.Base/Input/MouseDevice.cs        |  4 +--
 src/Avalonia.Base/Input/PenDevice.cs          |  5 +--
 src/Avalonia.Base/Input/TouchDevice.cs        |  7 +++--
 .../Platform/DefaultPlatformSettings.cs       | 30 ++++++++++++++++++
 .../Platform/IPlatformSettings.cs             | 22 ++++++++-----
 .../Remote/PreviewerWindowingPlatform.cs      | 11 ++-----
 .../AvaloniaHeadlessPlatform.cs               |  2 +-
 .../HeadlessPlatformStubs.cs                  | 10 ------
 src/Avalonia.Native/AvaloniaNativePlatform.cs | 14 ++-------
 src/Avalonia.Native/DoubleClickHelper.cs      |  6 ++--
 src/Avalonia.X11/Stubs.cs                     | 17 ----------
 src/Avalonia.X11/X11Platform.cs               |  2 +-
 .../LinuxFramebufferPlatform.cs               |  2 +-
 src/Linux/Avalonia.LinuxFramebuffer/Stubs.cs  |  9 ------
 src/Web/Avalonia.Web/WindowingPlatform.cs     | 27 +++++++++++-----
 src/Windows/Avalonia.Win32/Win32Platform.cs   | 31 ++++++++++++-------
 src/iOS/Avalonia.iOS/Platform.cs              | 17 ++--------
 .../Input/TouchDeviceTests.cs                 |  2 +-
 19 files changed, 112 insertions(+), 110 deletions(-)
 create mode 100644 src/Avalonia.Base/Platform/DefaultPlatformSettings.cs
 delete mode 100644 src/Avalonia.X11/Stubs.cs

diff --git a/src/Avalonia.Base/Input/Gestures.cs b/src/Avalonia.Base/Input/Gestures.cs
index d50abaa4b9..4437c8c2c0 100644
--- a/src/Avalonia.Base/Input/Gestures.cs
+++ b/src/Avalonia.Base/Input/Gestures.cs
@@ -1,5 +1,6 @@
 using System;
 using Avalonia.Interactivity;
+using Avalonia.Platform;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Input
@@ -125,7 +126,8 @@ namespace Avalonia.Input
                     e.InitialPressMouseButton is MouseButton.Left or MouseButton.Right)
                 {
                     var point = e.GetCurrentPoint((IVisual)target);
-                    var tapSize = new Size(4, 4);
+                    var settings = AvaloniaLocator.Current.GetService<IPlatformSettings>();
+                    var tapSize = settings?.GetTapSize(point.Pointer.Type) ?? new Size(4, 4);
                     var tapRect = new Rect(s_lastPressPoint, new Size())
                         .Inflate(new Thickness(tapSize.Width, tapSize.Height));
 
diff --git a/src/Avalonia.Base/Input/MouseDevice.cs b/src/Avalonia.Base/Input/MouseDevice.cs
index 055c9cf1fd..808efb3931 100644
--- a/src/Avalonia.Base/Input/MouseDevice.cs
+++ b/src/Avalonia.Base/Input/MouseDevice.cs
@@ -128,8 +128,8 @@ namespace Avalonia.Input
                 if (source != null)
                 {
                     var settings = AvaloniaLocator.Current.GetService<IPlatformSettings>();
-                    var doubleClickTime = settings?.DoubleClickTime.TotalMilliseconds ?? 500;
-                    var doubleClickSize = settings?.DoubleClickSize ?? new Size(4, 4);
+                    var doubleClickTime = settings?.GetDoubleTapTime(PointerType.Mouse).TotalMilliseconds ?? 500;
+                    var doubleClickSize = settings?.GetDoubleTapSize(PointerType.Mouse) ?? new Size(4, 4);
 
                     if (!_lastClickRect.Contains(p) || timestamp - _lastClickTime > doubleClickTime)
                     {
diff --git a/src/Avalonia.Base/Input/PenDevice.cs b/src/Avalonia.Base/Input/PenDevice.cs
index f5f0e90a45..31f34566be 100644
--- a/src/Avalonia.Base/Input/PenDevice.cs
+++ b/src/Avalonia.Base/Input/PenDevice.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using Avalonia.Input.Raw;
 using Avalonia.Platform;
 
@@ -77,8 +78,8 @@ namespace Avalonia.Input
             {
                 pointer.Capture(source);
                 var settings = AvaloniaLocator.Current.GetService<IPlatformSettings>();
-                var doubleClickTime = settings?.DoubleClickTime.TotalMilliseconds ?? 500;
-                var doubleClickSize = settings?.DoubleClickSize ?? new Size(4, 4);
+                var doubleClickTime = settings?.GetDoubleTapTime(PointerType.Pen).TotalMilliseconds ?? 500;
+                var doubleClickSize = settings?.GetDoubleTapSize(PointerType.Pen) ?? new Size(4, 4);
 
                 if (!_lastClickRect.Contains(p) || timestamp - _lastClickTime > doubleClickTime)
                 {
diff --git a/src/Avalonia.Base/Input/TouchDevice.cs b/src/Avalonia.Base/Input/TouchDevice.cs
index 1d5b1d6bbf..05b0a89e01 100644
--- a/src/Avalonia.Base/Input/TouchDevice.cs
+++ b/src/Avalonia.Base/Input/TouchDevice.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using Avalonia.Input.Raw;
 using Avalonia.Platform;
 
@@ -59,16 +60,18 @@ namespace Avalonia.Input
                 else
                 {
                     var settings = AvaloniaLocator.Current.GetRequiredService<IPlatformSettings>();
+                    var doubleClickTime = settings?.GetDoubleTapTime(PointerType.Touch).TotalMilliseconds ?? 500;
+                    var doubleClickSize = settings?.GetDoubleTapSize(PointerType.Touch) ?? new Size(4, 4);
 
                     if (!_lastClickRect.Contains(args.Position)
-                        || ev.Timestamp - _lastClickTime > settings.TouchDoubleClickTime.TotalMilliseconds)
+                        || ev.Timestamp - _lastClickTime > doubleClickTime)
                     {
                         _clickCount = 0;
                     }
                     ++_clickCount;
                     _lastClickTime = ev.Timestamp;
                     _lastClickRect = new Rect(args.Position, new Size())
-                        .Inflate(new Thickness(settings.TouchDoubleClickSize.Width / 2, settings.TouchDoubleClickSize.Height / 2));
+                        .Inflate(new Thickness(doubleClickSize.Width / 2, doubleClickSize.Height / 2));
                 }
 
                 target.RaiseEvent(new PointerPressedEventArgs(target, pointer,
diff --git a/src/Avalonia.Base/Platform/DefaultPlatformSettings.cs b/src/Avalonia.Base/Platform/DefaultPlatformSettings.cs
new file mode 100644
index 0000000000..dd3e1a4cb1
--- /dev/null
+++ b/src/Avalonia.Base/Platform/DefaultPlatformSettings.cs
@@ -0,0 +1,30 @@
+using System;
+using Avalonia.Input;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// A default implementation of <see cref="IPlatformSettings"/> for platforms which don't have
+    /// an OS-specific implementation.
+    /// </summary>
+    public class DefaultPlatformSettings : IPlatformSettings
+    {
+        public Size GetTapSize(PointerType type)
+        {
+            return type switch
+            {
+                PointerType.Touch => new(10, 10),
+                _ => new(4, 4),
+            };
+        }
+        public Size GetDoubleTapSize(PointerType type)
+        {
+            return type switch
+            {
+                PointerType.Touch => new(16, 16),
+                _ => new(4, 4),
+            };
+        }
+        public TimeSpan GetDoubleTapTime(PointerType type) => TimeSpan.FromMilliseconds(500);
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IPlatformSettings.cs b/src/Avalonia.Base/Platform/IPlatformSettings.cs
index 78d1817312..e7921883fd 100644
--- a/src/Avalonia.Base/Platform/IPlatformSettings.cs
+++ b/src/Avalonia.Base/Platform/IPlatformSettings.cs
@@ -1,4 +1,5 @@
 using System;
+using Avalonia.Input;
 using Avalonia.Metadata;
 
 namespace Avalonia.Platform
@@ -6,18 +7,25 @@ namespace Avalonia.Platform
     [Unstable]
     public interface IPlatformSettings
     {
-        Size DoubleClickSize { get; }
-
-        TimeSpan DoubleClickTime { get; }
+        /// <summary>
+        /// The size of the rectangle around the location of a pointer down that a pointer up
+        /// must occur within in order to register a tap gesture, in device-independent pixels.
+        /// </summary>
+        /// <param name="type">The pointer type.</param>
+        Size GetTapSize(PointerType type);
 
         /// <summary>
-        /// Determines the size of the area within that you should click twice in order for a double click to be counted.
+        /// The size of the rectangle around the location of a pointer down that a pointer up
+        /// must occur within in order to register a double-tap gesture, in device-independent
+        /// pixels.
         /// </summary>
-        Size TouchDoubleClickSize { get; }
+        /// <param name="type">The pointer type.</param>
+        Size GetDoubleTapSize(PointerType type);
 
         /// <summary>
-        /// Determines the time span that what will be used to determine the double-click.
+        /// Gets the maximum time that may occur between the first and second click of a double-
+        /// tap gesture.
         /// </summary>
-        TimeSpan TouchDoubleClickTime { get; }
+        TimeSpan GetDoubleTapTime(PointerType type);
     }
 }
diff --git a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs
index 5277435858..cd14b2d69a 100644
--- a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs
+++ b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs
@@ -9,7 +9,7 @@ using Avalonia.Rendering;
 
 namespace Avalonia.DesignerSupport.Remote
 {
-    class PreviewerWindowingPlatform : IWindowingPlatform, IPlatformSettings
+    class PreviewerWindowingPlatform : IWindowingPlatform
     {
         static readonly IKeyboardDevice Keyboard = new KeyboardDevice();
         private static IAvaloniaRemoteTransportConnection s_transport;
@@ -51,7 +51,7 @@ namespace Avalonia.DesignerSupport.Remote
                 .Bind<IClipboard>().ToSingleton<ClipboardStub>()
                 .Bind<ICursorFactory>().ToSingleton<CursorFactoryStub>()
                 .Bind<IKeyboardDevice>().ToConstant(Keyboard)
-                .Bind<IPlatformSettings>().ToConstant(instance)
+                .Bind<IPlatformSettings>().ToSingleton<DefaultPlatformSettings>()
                 .Bind<IPlatformThreadingInterface>().ToConstant(threading)
                 .Bind<IRenderLoop>().ToConstant(new RenderLoop())
                 .Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(60))
@@ -60,12 +60,5 @@ namespace Avalonia.DesignerSupport.Remote
                 .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>();
 
         }
-
-        public Size DoubleClickSize { get; } = new Size(2, 2);
-        public TimeSpan DoubleClickTime { get; } = TimeSpan.FromMilliseconds(500);
-
-        public Size TouchDoubleClickSize => new Size(16, 16);
-
-        public TimeSpan TouchDoubleClickTime => DoubleClickTime;
     }
 }
diff --git a/src/Avalonia.Headless/AvaloniaHeadlessPlatform.cs b/src/Avalonia.Headless/AvaloniaHeadlessPlatform.cs
index 4fcec6fd52..8da10fa59b 100644
--- a/src/Avalonia.Headless/AvaloniaHeadlessPlatform.cs
+++ b/src/Avalonia.Headless/AvaloniaHeadlessPlatform.cs
@@ -63,7 +63,7 @@ namespace Avalonia.Headless
                 .Bind<IPlatformThreadingInterface>().ToConstant(new HeadlessPlatformThreadingInterface())
                 .Bind<IClipboard>().ToSingleton<HeadlessClipboardStub>()
                 .Bind<ICursorFactory>().ToSingleton<HeadlessCursorFactoryStub>()
-                .Bind<IPlatformSettings>().ToConstant(new HeadlessPlatformSettingsStub())
+                .Bind<IPlatformSettings>().ToSingleton<DefaultPlatformSettings>()
                 .Bind<IPlatformIconLoader>().ToSingleton<HeadlessIconLoaderStub>()
                 .Bind<IKeyboardDevice>().ToConstant(new KeyboardDevice())
                 .Bind<IRenderLoop>().ToConstant(new RenderLoop())
diff --git a/src/Avalonia.Headless/HeadlessPlatformStubs.cs b/src/Avalonia.Headless/HeadlessPlatformStubs.cs
index 76948e9286..688b8e0398 100644
--- a/src/Avalonia.Headless/HeadlessPlatformStubs.cs
+++ b/src/Avalonia.Headless/HeadlessPlatformStubs.cs
@@ -65,16 +65,6 @@ namespace Avalonia.Headless
         }
     }
 
-    class HeadlessPlatformSettingsStub : IPlatformSettings
-    {
-        public Size DoubleClickSize { get; } = new Size(2, 2);
-        public TimeSpan DoubleClickTime { get; } = TimeSpan.FromMilliseconds(500);
-
-        public Size TouchDoubleClickSize => new Size(16,16);
-
-        public TimeSpan TouchDoubleClickTime => DoubleClickTime;
-    }
-
     class HeadlessGlyphTypefaceImpl : IGlyphTypeface
     {
         public FontMetrics Metrics => new FontMetrics
diff --git a/src/Avalonia.Native/AvaloniaNativePlatform.cs b/src/Avalonia.Native/AvaloniaNativePlatform.cs
index 66d78cbb60..db6b6f57cd 100644
--- a/src/Avalonia.Native/AvaloniaNativePlatform.cs
+++ b/src/Avalonia.Native/AvaloniaNativePlatform.cs
@@ -14,7 +14,7 @@ using MicroCom.Runtime;
 
 namespace Avalonia.Native
 {
-    class AvaloniaNativePlatform : IPlatformSettings, IWindowingPlatform
+    class AvaloniaNativePlatform : IWindowingPlatform
     {
         private readonly IAvaloniaNativeFactory _factory;
         private AvaloniaNativePlatformOptions _options;
@@ -26,16 +26,6 @@ namespace Avalonia.Native
         internal static readonly KeyboardDevice KeyboardDevice = new KeyboardDevice();
         [CanBeNull] internal static Compositor Compositor { get; private set; }
 
-        public Size DoubleClickSize => new Size(4, 4);
-
-        public TimeSpan DoubleClickTime => TimeSpan.FromMilliseconds(500); //TODO
-
-        /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickSize"/>
-        public Size TouchDoubleClickSize => new Size(16, 16);
-
-        /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickTime"/>
-        public TimeSpan TouchDoubleClickTime => DoubleClickTime;
-
         public static AvaloniaNativePlatform Initialize(IntPtr factory, AvaloniaNativePlatformOptions options)
         {
             var result = new AvaloniaNativePlatform(MicroComRuntime.CreateProxyFor<IAvaloniaNativeFactory>(factory, true));
@@ -113,7 +103,7 @@ namespace Avalonia.Native
                 .Bind<ICursorFactory>().ToConstant(new CursorFactory(_factory.CreateCursorFactory()))
                 .Bind<IPlatformIconLoader>().ToSingleton<IconLoader>()
                 .Bind<IKeyboardDevice>().ToConstant(KeyboardDevice)
-                .Bind<IPlatformSettings>().ToConstant(this)
+                .Bind<IPlatformSettings>().ToSingleton<DefaultPlatformSettings>()
                 .Bind<IWindowingPlatform>().ToConstant(this)
                 .Bind<IClipboard>().ToConstant(new ClipboardImpl(_factory.CreateClipboard()))
                 .Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(60))
diff --git a/src/Avalonia.Native/DoubleClickHelper.cs b/src/Avalonia.Native/DoubleClickHelper.cs
index 7618d6976a..02e74d7d63 100644
--- a/src/Avalonia.Native/DoubleClickHelper.cs
+++ b/src/Avalonia.Native/DoubleClickHelper.cs
@@ -1,3 +1,4 @@
+using Avalonia.Input;
 using Avalonia.Platform;
 
 namespace Avalonia.Native
@@ -13,7 +14,8 @@ namespace Avalonia.Native
             Point p)
         {
             var settings = AvaloniaLocator.Current.GetService<IPlatformSettings>();
-            var doubleClickTime = settings.DoubleClickTime.TotalMilliseconds;
+            var doubleClickTime = settings?.GetDoubleTapTime(PointerType.Mouse).TotalMilliseconds ?? 500;
+            var doubleClickSize = settings?.GetDoubleTapSize(PointerType.Mouse) ?? new Size(4, 4);
 
             if (!_lastClickRect.Contains(p) || timestamp - _lastClickTime > doubleClickTime)
             {
@@ -23,7 +25,7 @@ namespace Avalonia.Native
             ++_clickCount;
             _lastClickTime = timestamp;
             _lastClickRect = new Rect(p, new Size())
-                .Inflate(new Thickness(settings.DoubleClickSize.Width / 2, settings.DoubleClickSize.Height / 2));
+                .Inflate(new Thickness(doubleClickSize.Width / 2, doubleClickSize.Height / 2));
 
             return _clickCount == 2;
         }
diff --git a/src/Avalonia.X11/Stubs.cs b/src/Avalonia.X11/Stubs.cs
deleted file mode 100644
index f73512f1e8..0000000000
--- a/src/Avalonia.X11/Stubs.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using Avalonia.Platform;
-
-namespace Avalonia.X11
-{
-    class PlatformSettingsStub : IPlatformSettings
-    {
-        public Size DoubleClickSize { get; } = new Size(2, 2);
-        public TimeSpan DoubleClickTime { get; } = TimeSpan.FromMilliseconds(500);
-
-        /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickSize"/>
-        public Size TouchDoubleClickSize => new Size(16, 16);
-
-        /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickTime"/>
-        public TimeSpan TouchDoubleClickTime => DoubleClickTime;
-    }
-}
diff --git a/src/Avalonia.X11/X11Platform.cs b/src/Avalonia.X11/X11Platform.cs
index 381cdd74c3..96dc16e186 100644
--- a/src/Avalonia.X11/X11Platform.cs
+++ b/src/Avalonia.X11/X11Platform.cs
@@ -80,7 +80,7 @@ namespace Avalonia.X11
                 .Bind<IKeyboardDevice>().ToFunc(() => KeyboardDevice)
                 .Bind<ICursorFactory>().ToConstant(new X11CursorFactory(Display))
                 .Bind<IClipboard>().ToConstant(new X11Clipboard(this))
-                .Bind<IPlatformSettings>().ToConstant(new PlatformSettingsStub())
+                .Bind<IPlatformSettings>().ToSingleton<DefaultPlatformSettings>()
                 .Bind<IPlatformIconLoader>().ToConstant(new X11IconLoader())
                 .Bind<IMountedVolumeInfoProvider>().ToConstant(new LinuxMountedVolumeInfoProvider())
                 .Bind<IPlatformLifetimeEventsImpl>().ToConstant(new X11PlatformLifetimeEvents(this));
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
index 730eb0071d..d881a97af2 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
@@ -51,7 +51,7 @@ namespace Avalonia.LinuxFramebuffer
                 .Bind<IRenderLoop>().ToConstant(new RenderLoop())
                 .Bind<ICursorFactory>().ToTransient<CursorFactoryStub>()
                 .Bind<IKeyboardDevice>().ToConstant(new KeyboardDevice())
-                .Bind<IPlatformSettings>().ToSingleton<PlatformSettings>()
+                .Bind<IPlatformSettings>().ToSingleton<DefaultPlatformSettings>()
                 .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>();
             
             Compositor = new Compositor(
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Stubs.cs b/src/Linux/Avalonia.LinuxFramebuffer/Stubs.cs
index dd60d5f09d..c5c7c13c67 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Stubs.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Stubs.cs
@@ -14,13 +14,4 @@ namespace Avalonia.LinuxFramebuffer
             public void Dispose() { }
         }
     }
-    internal class PlatformSettings : IPlatformSettings
-    {
-        public Size DoubleClickSize { get; } = new Size(4, 4);
-        public TimeSpan DoubleClickTime { get; } = new TimeSpan(0, 0, 0, 0, 500);
-
-        public Size TouchDoubleClickSize => new Size(16,16);
-
-        public TimeSpan TouchDoubleClickTime => DoubleClickTime;
-    }
 }
diff --git a/src/Web/Avalonia.Web/WindowingPlatform.cs b/src/Web/Avalonia.Web/WindowingPlatform.cs
index 7c2a84516b..29c797660f 100644
--- a/src/Web/Avalonia.Web/WindowingPlatform.cs
+++ b/src/Web/Avalonia.Web/WindowingPlatform.cs
@@ -45,13 +45,6 @@ namespace Avalonia.Web
                 .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>();
         }
 
-        public Size DoubleClickSize { get; } = new Size(2, 2);
-
-        public TimeSpan DoubleClickTime { get; } = TimeSpan.FromMilliseconds(500);
-
-        public Size TouchDoubleClickSize => new Size(16, 16);
-
-        public TimeSpan TouchDoubleClickTime => DoubleClickTime;
         public void RunLoop(CancellationToken cancellationToken)
         {
             throw new NotSupportedException();
@@ -101,5 +94,25 @@ namespace Avalonia.Web
         {
             return AvaloniaLocator.Current.GetRequiredService<IRuntimePlatform>();
         }
+
+        Size IPlatformSettings.GetTapSize(PointerType type)
+        {
+            return type switch
+            {
+                PointerType.Touch => new(10, 10),
+                _ => new(4, 4),
+            };
+        }
+
+        Size IPlatformSettings.GetDoubleTapSize(PointerType type)
+        {
+            return type switch
+            {
+                PointerType.Touch => new(16, 16),
+                _ => new(4, 4),
+            };
+        }
+
+        TimeSpan IPlatformSettings.GetDoubleTapTime(PointerType type) => TimeSpan.FromMilliseconds(500);
     }
 }
diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
index 3cdc3586dc..18977ec4c3 100644
--- a/src/Windows/Avalonia.Win32/Win32Platform.cs
+++ b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -130,17 +130,6 @@ namespace Avalonia.Win32
         
         internal static Compositor Compositor { get; private set; }
 
-        public Size DoubleClickSize => new Size(
-            UnmanagedMethods.GetSystemMetrics(UnmanagedMethods.SystemMetric.SM_CXDOUBLECLK),
-            UnmanagedMethods.GetSystemMetrics(UnmanagedMethods.SystemMetric.SM_CYDOUBLECLK));
-
-        public TimeSpan DoubleClickTime => TimeSpan.FromMilliseconds(UnmanagedMethods.GetDoubleClickTime());
-
-        /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickSize"/>
-        public Size TouchDoubleClickSize => new Size(16,16);
-
-        /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickTime"/>
-        public TimeSpan TouchDoubleClickTime => DoubleClickTime;
         public static void Initialize()
         {
             Initialize(new Win32PlatformOptions());
@@ -398,5 +387,25 @@ namespace Avalonia.Win32
 
             SetProcessDPIAware();
         }
+
+        Size IPlatformSettings.GetTapSize(PointerType type)
+        {
+            return type switch
+            {
+                PointerType.Touch => new(10, 10),
+                _ => new(GetSystemMetrics(SystemMetric.SM_CXDRAG), GetSystemMetrics(SystemMetric.SM_CYDRAG)),
+            };
+        }
+
+        Size IPlatformSettings.GetDoubleTapSize(PointerType type)
+        {
+            return type switch
+            {
+                PointerType.Touch => new(16, 16),
+                _ => new(GetSystemMetrics(SystemMetric.SM_CXDOUBLECLK), GetSystemMetrics(SystemMetric.SM_CYDOUBLECLK)),
+            };
+        }
+
+        TimeSpan IPlatformSettings.GetDoubleTapTime(PointerType type) => TimeSpan.FromMilliseconds(GetDoubleClickTime());
     }
 }
diff --git a/src/iOS/Avalonia.iOS/Platform.cs b/src/iOS/Avalonia.iOS/Platform.cs
index 67d037f9e5..c2cf8c6f6c 100644
--- a/src/iOS/Avalonia.iOS/Platform.cs
+++ b/src/iOS/Avalonia.iOS/Platform.cs
@@ -28,32 +28,19 @@ namespace Avalonia.iOS
         public static EaglFeature GlFeature;
         public static DisplayLinkTimer Timer;
         internal static Compositor Compositor { get; private set; }
-        
-        class PlatformSettings : IPlatformSettings
-        {
-            /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickSize"/>
-            public Size TouchDoubleClickSize => new Size(10, 10);
-
-            /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickTime"/>
-            public TimeSpan TouchDoubleClickTime => TimeSpan.FromMilliseconds(500);
-
-            public Size DoubleClickSize => new Size(4, 4);
-
-            public TimeSpan DoubleClickTime => TouchDoubleClickTime;
-        }
 
         public static void Register()
         {
             GlFeature ??= new EaglFeature();
             Timer ??= new DisplayLinkTimer();
             var keyboard = new KeyboardDevice();
-            
+
             AvaloniaLocator.CurrentMutable
                 .Bind<IPlatformOpenGlInterface>().ToConstant(GlFeature)
                 .Bind<ICursorFactory>().ToConstant(new CursorFactoryStub())
                 .Bind<IWindowingPlatform>().ToConstant(new WindowingPlatformStub())
                 .Bind<IClipboard>().ToConstant(new ClipboardImpl())
-                .Bind<IPlatformSettings>().ToConstant(new PlatformSettings())
+                .Bind<IPlatformSettings>().ToSingleton<DefaultPlatformSettings>()
                 .Bind<IPlatformIconLoader>().ToConstant(new PlatformIconLoaderStub())
                 .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>()
                 .Bind<IRenderLoop>().ToSingleton<RenderLoop>()
diff --git a/tests/Avalonia.Base.UnitTests/Input/TouchDeviceTests.cs b/tests/Avalonia.Base.UnitTests/Input/TouchDeviceTests.cs
index 7b7d547346..1070138221 100644
--- a/tests/Avalonia.Base.UnitTests/Input/TouchDeviceTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Input/TouchDeviceTests.cs
@@ -209,7 +209,7 @@ namespace Avalonia.Input.UnitTests
             var unitTestApp = UnitTestApplication.Start(
                 new TestServices(inputManager: new InputManager()));
             var iSettingsMock = new Mock<IPlatformSettings>();
-            iSettingsMock.Setup(x => x.TouchDoubleClickTime).Returns(doubleClickTime);
+            iSettingsMock.Setup(x => x.GetDoubleTapTime(It.IsAny<PointerType>())).Returns(doubleClickTime);
             AvaloniaLocator.CurrentMutable.BindToSelf(this)
                .Bind<IPlatformSettings>().ToConstant(iSettingsMock.Object);
             return unitTestApp;

From dbd1ac3af6fd5ccb84dd070fdbad8bd453971726 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 3 Nov 2022 23:35:54 +0100
Subject: [PATCH 05/13] Fix DoubleTapped integration test.

`DoubleTapped` is raised on second pointer press, not release.
---
 .../Avalonia.IntegrationTests.Appium/GestureTests.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs b/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs
index 61d8ea1df6..f4f83e23d0 100644
--- a/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs
@@ -84,9 +84,17 @@ namespace Avalonia.IntegrationTests.Appium
 
             Thread.Sleep(100);
 
-            new Actions(_session).ClickAndHold(border).Release().Perform();
+            // DoubleTapped is raised on second pointer press, not release.
+            new Actions(_session).ClickAndHold(border).Perform();
 
-            Assert.Equal("DoubleTapped", lastGesture.Text);
+            try
+            {
+                Assert.Equal("DoubleTapped", lastGesture.Text);
+            }
+            finally
+            {
+                new Actions(_session).Release(border).Perform();
+            }
         }
 
         [Fact]

From 2337d20df1a07ca99471aff266f995848a6b08ac Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 4 Nov 2022 09:49:17 +0100
Subject: [PATCH 06/13] Add failing test for #8733.

---
 .../GestureTests.cs                            | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs b/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs
index f4f83e23d0..205ad6b8cf 100644
--- a/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs
@@ -18,7 +18,7 @@ namespace Avalonia.IntegrationTests.Appium
             var tabs = _session.FindElementByAccessibilityId("MainTabs");
             var tab = tabs.FindElementByName("Gestures");
             tab.Click();
-            var clear = _session.FindElementByAccessibilityId("ClearLastGesture");
+            var clear = _session.FindElementByAccessibilityId("ResetGestures");
             clear.Click();
         }
 
@@ -112,6 +112,22 @@ namespace Avalonia.IntegrationTests.Appium
             Assert.Equal("Tapped", lastGesture.Text);
         }
 
+        [Fact]
+        public void DoubleTapped_Is_Raised_After_Control_Changes()
+        {
+            // #8733
+            var border = _session.FindElementByAccessibilityId("GestureBorder");
+            var lastGesture = _session.FindElementByAccessibilityId("LastGesture");
+
+            new Actions(_session)
+                .MoveToElement(border)
+                .DoubleClick()
+                .DoubleClick()
+                .Perform();
+
+            Assert.Equal("DoubleTapped2", lastGesture.Text);
+        }
+
         [Fact]
         public void RightTapped_Is_Raised()
         {

From 73cc16382248a8f508569bf398364fcc649b357d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 4 Nov 2022 09:49:29 +0100
Subject: [PATCH 07/13] Fix #8733.

---
 src/Avalonia.Base/Input/Gestures.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Avalonia.Base/Input/Gestures.cs b/src/Avalonia.Base/Input/Gestures.cs
index 4437c8c2c0..82ed96d982 100644
--- a/src/Avalonia.Base/Input/Gestures.cs
+++ b/src/Avalonia.Base/Input/Gestures.cs
@@ -94,7 +94,7 @@ namespace Avalonia.Input
                 var e = (PointerPressedEventArgs)ev;
                 var visual = (IVisual)ev.Source;
 
-                if (e.ClickCount <= 1)
+                if (e.ClickCount % 2 == 1)
                 {
                     s_isDoubleTapped = false;
                     s_lastPress.SetTarget(ev.Source);
@@ -108,10 +108,6 @@ namespace Avalonia.Input
                         e.Source.RaiseEvent(new TappedEventArgs(DoubleTappedEvent, e));
                     }
                 }
-                else
-                {
-                    s_isDoubleTapped = false;
-                }
             }
         }
 

From c733950afffb3e463bf23f36f9e9f2bfe0d6e6e2 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 4 Nov 2022 10:09:33 +0100
Subject: [PATCH 08/13] Refactor gestures tab in IntegrationTestApp.

---
 samples/IntegrationTestApp/MainWindow.axaml   | 13 ++++--
 .../IntegrationTestApp/MainWindow.axaml.cs    | 42 +++++++++++++++----
 2 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/samples/IntegrationTestApp/MainWindow.axaml b/samples/IntegrationTestApp/MainWindow.axaml
index 2a0a758852..76ecfcc622 100644
--- a/samples/IntegrationTestApp/MainWindow.axaml
+++ b/samples/IntegrationTestApp/MainWindow.axaml
@@ -72,12 +72,17 @@
       <TabItem Header="Gestures">
         <DockPanel>
           <DockPanel DockPanel.Dock="Top">
-            <Button Name="ClearLastGesture" DockPanel.Dock="Right">Clear</Button>
+            <Button Name="ResetGestures" DockPanel.Dock="Right">Reset</Button>
             <TextBlock Name="LastGesture" />
           </DockPanel>
-          <Border Name="GestureBorder" Background="Blue" 
-                  AutomationProperties.AccessibilityView="Content"
-                  AutomationProperties.ControlTypeOverride="Image"/>
+          <Panel>
+            <Border Name="GestureBorder" Background="Blue"
+                    AutomationProperties.AccessibilityView="Content"
+                    AutomationProperties.ControlTypeOverride="Image"/>
+            <Border Name="GestureBorder2" Background="Green" IsVisible="False"
+                    AutomationProperties.AccessibilityView="Content"
+                    AutomationProperties.ControlTypeOverride="Image"/>
+          </Panel>
         </DockPanel>
       </TabItem>
 
diff --git a/samples/IntegrationTestApp/MainWindow.axaml.cs b/samples/IntegrationTestApp/MainWindow.axaml.cs
index 791e221d50..e8fb455c35 100644
--- a/samples/IntegrationTestApp/MainWindow.axaml.cs
+++ b/samples/IntegrationTestApp/MainWindow.axaml.cs
@@ -18,18 +18,10 @@ namespace IntegrationTestApp
         {
             InitializeComponent();
             InitializeViewMenu();
+            InitializeGesturesTab();
             this.AttachDevTools();
             AddHandler(Button.ClickEvent, OnButtonClick);
             ListBoxItems = Enumerable.Range(0, 100).Select(x => "Item " + x).ToList();
-            
-            var gestureBorder = this.GetControl<Border>("GestureBorder");
-            var lastGesture = this.GetControl<TextBlock>("LastGesture");
-            var clearLastGesture = this.GetControl<Button>("ClearLastGesture");
-            gestureBorder.Tapped += (s, e) => lastGesture.Text = "Tapped";
-            gestureBorder.DoubleTapped += (s, e) => lastGesture.Text = "DoubleTapped";
-            Gestures.AddRightTappedHandler(gestureBorder, (s, e) => lastGesture.Text = "RightTapped");
-            clearLastGesture.Click += (s, e) => lastGesture.Text = string.Empty;
-            
             DataContext = this;
         }
 
@@ -130,6 +122,38 @@ namespace IntegrationTestApp
             }
         }
 
+        private void InitializeGesturesTab()
+        {
+            var gestureBorder = this.GetControl<Border>("GestureBorder");
+            var gestureBorder2 = this.GetControl<Border>("GestureBorder2");
+            var lastGesture = this.GetControl<TextBlock>("LastGesture");
+            var resetGestures = this.GetControl<Button>("ResetGestures");
+            gestureBorder.Tapped += (s, e) => lastGesture.Text = "Tapped";
+            
+            gestureBorder.DoubleTapped += (s, e) =>
+            {
+                lastGesture.Text = "DoubleTapped";
+
+                // Testing #8733
+                gestureBorder.IsVisible = false;
+                gestureBorder2.IsVisible = true;
+            };
+
+            gestureBorder2.DoubleTapped += (s, e) =>
+            {
+                lastGesture.Text = "DoubleTapped2";
+            };
+
+            Gestures.AddRightTappedHandler(gestureBorder, (s, e) => lastGesture.Text = "RightTapped");
+            
+            resetGestures.Click += (s, e) =>
+            {
+                lastGesture.Text = string.Empty;
+                gestureBorder.IsVisible = true;
+                gestureBorder2.IsVisible = false;
+            };
+        }
+
         private void MenuClicked(object? sender, RoutedEventArgs e)
         {
             var clickedMenuItemTextBlock = this.Get<TextBlock>("ClickedMenuItem");

From a62c56186fef420cb6326c862a218ac172aaaf30 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 9 Nov 2022 15:22:30 +0100
Subject: [PATCH 09/13] Use GetRequiredService in touch/mouse device.

---
 src/Avalonia.Base/Input/MouseDevice.cs | 6 +++---
 src/Avalonia.Base/Input/TouchDevice.cs | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Base/Input/MouseDevice.cs b/src/Avalonia.Base/Input/MouseDevice.cs
index 808efb3931..b4bc419223 100644
--- a/src/Avalonia.Base/Input/MouseDevice.cs
+++ b/src/Avalonia.Base/Input/MouseDevice.cs
@@ -127,9 +127,9 @@ namespace Avalonia.Input
                 _pointer.Capture(source);
                 if (source != null)
                 {
-                    var settings = AvaloniaLocator.Current.GetService<IPlatformSettings>();
-                    var doubleClickTime = settings?.GetDoubleTapTime(PointerType.Mouse).TotalMilliseconds ?? 500;
-                    var doubleClickSize = settings?.GetDoubleTapSize(PointerType.Mouse) ?? new Size(4, 4);
+                    var settings = AvaloniaLocator.Current.GetRequiredService<IPlatformSettings>();
+                    var doubleClickTime = settings.GetDoubleTapTime(PointerType.Mouse).TotalMilliseconds;
+                    var doubleClickSize = settings.GetDoubleTapSize(PointerType.Mouse);
 
                     if (!_lastClickRect.Contains(p) || timestamp - _lastClickTime > doubleClickTime)
                     {
diff --git a/src/Avalonia.Base/Input/TouchDevice.cs b/src/Avalonia.Base/Input/TouchDevice.cs
index 05b0a89e01..c98944359d 100644
--- a/src/Avalonia.Base/Input/TouchDevice.cs
+++ b/src/Avalonia.Base/Input/TouchDevice.cs
@@ -60,8 +60,8 @@ namespace Avalonia.Input
                 else
                 {
                     var settings = AvaloniaLocator.Current.GetRequiredService<IPlatformSettings>();
-                    var doubleClickTime = settings?.GetDoubleTapTime(PointerType.Touch).TotalMilliseconds ?? 500;
-                    var doubleClickSize = settings?.GetDoubleTapSize(PointerType.Touch) ?? new Size(4, 4);
+                    var doubleClickTime = settings.GetDoubleTapTime(PointerType.Touch).TotalMilliseconds;
+                    var doubleClickSize = settings.GetDoubleTapSize(PointerType.Touch);
 
                     if (!_lastClickRect.Contains(args.Position)
                         || ev.Timestamp - _lastClickTime > doubleClickTime)

From 0e951befdf45cb66422fb31a10d8193b57b4fc21 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 9 Nov 2022 15:27:46 +0100
Subject: [PATCH 10/13] Use DefaultPlatformSettings in Web platform.

---
 src/Web/Avalonia.Web/WindowingPlatform.cs | 24 ++---------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/Web/Avalonia.Web/WindowingPlatform.cs b/src/Web/Avalonia.Web/WindowingPlatform.cs
index 29c797660f..c399c22c61 100644
--- a/src/Web/Avalonia.Web/WindowingPlatform.cs
+++ b/src/Web/Avalonia.Web/WindowingPlatform.cs
@@ -8,7 +8,7 @@ using Avalonia.Threading;
 
 namespace Avalonia.Web
 {
-    internal class BrowserWindowingPlatform : IWindowingPlatform, IPlatformSettings, IPlatformThreadingInterface
+    internal class BrowserWindowingPlatform : IWindowingPlatform, IPlatformThreadingInterface
     {
         private bool _signaled;
         private static KeyboardDevice? s_keyboard;
@@ -36,7 +36,7 @@ namespace Avalonia.Web
                 .Bind<IClipboard>().ToSingleton<ClipboardImpl>()
                 .Bind<ICursorFactory>().ToSingleton<CssCursorFactory>()
                 .Bind<IKeyboardDevice>().ToConstant(s_keyboard)
-                .Bind<IPlatformSettings>().ToConstant(instance)
+                .Bind<IPlatformSettings>().ToSingleton<DefaultPlatformSettings>()
                 .Bind<IPlatformThreadingInterface>().ToConstant(instance)
                 .Bind<IRenderLoop>().ToConstant(new RenderLoop())
                 .Bind<IRenderTimer>().ToConstant(ManualTriggerRenderTimer.Instance)
@@ -94,25 +94,5 @@ namespace Avalonia.Web
         {
             return AvaloniaLocator.Current.GetRequiredService<IRuntimePlatform>();
         }
-
-        Size IPlatformSettings.GetTapSize(PointerType type)
-        {
-            return type switch
-            {
-                PointerType.Touch => new(10, 10),
-                _ => new(4, 4),
-            };
-        }
-
-        Size IPlatformSettings.GetDoubleTapSize(PointerType type)
-        {
-            return type switch
-            {
-                PointerType.Touch => new(16, 16),
-                _ => new(4, 4),
-            };
-        }
-
-        TimeSpan IPlatformSettings.GetDoubleTapTime(PointerType type) => TimeSpan.FromMilliseconds(500);
     }
 }

From 1fc811f82c0d31ae956effe9e4017307d6120b14 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 9 Nov 2022 18:55:14 -0500
Subject: [PATCH 11/13] Fix touch tests

---
 tests/Avalonia.Base.UnitTests/Input/TouchDeviceTests.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/Avalonia.Base.UnitTests/Input/TouchDeviceTests.cs b/tests/Avalonia.Base.UnitTests/Input/TouchDeviceTests.cs
index 1070138221..c0c0182622 100644
--- a/tests/Avalonia.Base.UnitTests/Input/TouchDeviceTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Input/TouchDeviceTests.cs
@@ -210,6 +210,8 @@ namespace Avalonia.Input.UnitTests
                 new TestServices(inputManager: new InputManager()));
             var iSettingsMock = new Mock<IPlatformSettings>();
             iSettingsMock.Setup(x => x.GetDoubleTapTime(It.IsAny<PointerType>())).Returns(doubleClickTime);
+            iSettingsMock.Setup(x => x.GetDoubleTapSize(It.IsAny<PointerType>())).Returns(new Size(16, 16));
+            iSettingsMock.Setup(x => x.GetTapSize(It.IsAny<PointerType>())).Returns(new Size(16, 16));
             AvaloniaLocator.CurrentMutable.BindToSelf(this)
                .Bind<IPlatformSettings>().ToConstant(iSettingsMock.Object);
             return unitTestApp;

From 0b3f2adce91af8e732b7dd8fc8af19afb70d76a7 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 9 Nov 2022 18:55:27 -0500
Subject: [PATCH 12/13] Use DefaultPlatformSettings for android too, fix build
 error

---
 src/Android/Avalonia.Android/AndroidPlatform.cs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/Android/Avalonia.Android/AndroidPlatform.cs b/src/Android/Avalonia.Android/AndroidPlatform.cs
index ed5b46d398..0d77a4c905 100644
--- a/src/Android/Avalonia.Android/AndroidPlatform.cs
+++ b/src/Android/Avalonia.Android/AndroidPlatform.cs
@@ -31,16 +31,6 @@ namespace Avalonia.Android
         public static readonly AndroidPlatform Instance = new AndroidPlatform();
         public static AndroidPlatformOptions Options { get; private set; }
 
-        /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickSize"/>
-        public Size TouchDoubleClickSize => new Size(4, 4);
-
-        /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickTime"/>
-        public TimeSpan TouchDoubleClickTime => TimeSpan.FromMilliseconds(200);
-
-        public Size DoubleClickSize => TouchDoubleClickSize;
-
-        public TimeSpan DoubleClickTime => TimeSpan.FromMilliseconds(500);
-
         internal static Compositor Compositor { get; private set; }
 
         public static void Initialize()
@@ -52,7 +42,7 @@ namespace Avalonia.Android
                 .Bind<ICursorFactory>().ToTransient<CursorFactory>()
                 .Bind<IWindowingPlatform>().ToConstant(new WindowingPlatformStub())
                 .Bind<IKeyboardDevice>().ToSingleton<AndroidKeyboardDevice>()
-                .Bind<IPlatformSettings>().ToConstant(Instance)
+                .Bind<IPlatformSettings>().ToSingleton<DefaultPlatformSettings>()
                 .Bind<IPlatformThreadingInterface>().ToConstant(new AndroidThreadingInterface())
                 .Bind<IPlatformIconLoader>().ToSingleton<PlatformIconLoaderStub>()
                 .Bind<IRenderTimer>().ToConstant(new ChoreographerTimer())

From bb0c4d399b11fc69cb9dea4b78532e73ea398bd4 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 9 Nov 2022 19:02:00 -0500
Subject: [PATCH 13/13] Remove missed interface

---
 src/Android/Avalonia.Android/AndroidPlatform.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Android/Avalonia.Android/AndroidPlatform.cs b/src/Android/Avalonia.Android/AndroidPlatform.cs
index 0d77a4c905..2b6d29e7c5 100644
--- a/src/Android/Avalonia.Android/AndroidPlatform.cs
+++ b/src/Android/Avalonia.Android/AndroidPlatform.cs
@@ -26,7 +26,7 @@ namespace Avalonia
 
 namespace Avalonia.Android
 {
-    class AndroidPlatform : IPlatformSettings
+    class AndroidPlatform
     {
         public static readonly AndroidPlatform Instance = new AndroidPlatform();
         public static AndroidPlatformOptions Options { get; private set; }