Update pen tap settings (#17780)

* Apply touch TapSize settings for Pen too * Windows: use GetSystemMetrics only for Mouse pointer type, and call base implementation for rest
AvaloniaUI · Dec 19, 2024 · 04231a4 · 04231a4
1 parent 5cc111c
commit 04231a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Avalonia.Base/Platform/DefaultPlatformSettings.cs b/src/Avalonia.Base/Platform/DefaultPlatformSettings.cs
@@ -18,7 +18,7 @@ public virtual Size GetTapSize(PointerType type)
         {
             return type switch
             {
-                PointerType.Touch => new(10, 10),
+                PointerType.Touch or PointerType.Pen => new(10, 10),
                 _ => new(4, 4),
             };
         }
@@ -27,7 +27,7 @@ public virtual Size GetDoubleTapSize(PointerType type)
         {
             return type switch
             {
-                PointerType.Touch => new(16, 16),
+                PointerType.Touch or PointerType.Pen => new(16, 16),
                 _ => new(4, 4),
             };
         }

diff --git a/src/Windows/Avalonia.Win32/Win32PlatformSettings.cs b/src/Windows/Avalonia.Win32/Win32PlatformSettings.cs
@@ -18,17 +18,17 @@ public override Size GetTapSize(PointerType type)
     {
         return type switch
         {
-            PointerType.Touch => new(10, 10),
-            _ => new(GetSystemMetrics(SystemMetric.SM_CXDRAG), GetSystemMetrics(SystemMetric.SM_CYDRAG)),
+            PointerType.Mouse => new(GetSystemMetrics(SystemMetric.SM_CXDRAG), GetSystemMetrics(SystemMetric.SM_CYDRAG)),
+            _ => base.GetTapSize(type)
         };
     }
 
     public override Size GetDoubleTapSize(PointerType type)
     {
         return type switch
         {
-            PointerType.Touch => new(16, 16),
-            _ => new(GetSystemMetrics(SystemMetric.SM_CXDOUBLECLK), GetSystemMetrics(SystemMetric.SM_CYDOUBLECLK)),
+            PointerType.Mouse => new(GetSystemMetrics(SystemMetric.SM_CXDOUBLECLK), GetSystemMetrics(SystemMetric.SM_CYDOUBLECLK)),
+            _ => base.GetDoubleTapSize(type)
         };
     }