Merge pull request AvaloniaUI#7834 from AvaloniaUI/fixes/touch-date-time-pickers

maxkatz6 · grokys · commit a888ca3709ee · 2022-04-11T09:36:35.000+02:00
fix using touch for date/time pickers.
diff --git a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
@@ -2,6 +2,8 @@
 using System.Globalization;
 using System.Linq;
 using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Media;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Primitives
@@ -58,18 +60,17 @@ public class DateTimePickerPanel : Panel, ILogicalScrollable
         private Vector _offset;
         private bool _hasInit;
         private bool _suppressUpdateOffset;
-        private ListBoxItem _pressedItem;
 
         public DateTimePickerPanel()
         {
             FormatDate = DateTime.Now;
-            AddHandler(ListBoxItem.PointerPressedEvent, OnItemPointerDown, Avalonia.Interactivity.RoutingStrategies.Bubble);
-            AddHandler(ListBoxItem.PointerReleasedEvent, OnItemPointerUp, Avalonia.Interactivity.RoutingStrategies.Bubble);
+            AddHandler(TappedEvent, OnItemTapped, RoutingStrategies.Bubble);
         }
 
         static DateTimePickerPanel()
         {
             FocusableProperty.OverrideDefaultValue<DateTimePickerPanel>(true);
+            BackgroundProperty.OverrideDefaultValue<DateTimePickerPanel>(Brushes.Transparent);
             AffectsMeasure<DateTimePickerPanel>(ItemHeightProperty);
         }
 
@@ -523,22 +524,13 @@ private int CoerceSelected(int newValue)
             return newValue;
         }
 
-        private void OnItemPointerDown(object sender, PointerPressedEventArgs e)
+        private void OnItemTapped(object sender, TappedEventArgs e)
         {
-            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+            if (e.Source is IVisual source && 
+                GetItemFromSource(source) is ListBoxItem listBoxItem &&
+                listBoxItem.Tag is int tag)
             {
-                _pressedItem = GetItemFromSource((IVisual)e.Source);
-                e.Handled = true;
-            }
-        }
-
-        private void OnItemPointerUp(object sender, PointerReleasedEventArgs e)
-        {
-            if (e.GetCurrentPoint(this).Properties.PointerUpdateKind == PointerUpdateKind.LeftButtonReleased &&
-                _pressedItem != null)
-            {
-                SelectedValue = (int)GetItemFromSource((IVisual)e.Source).Tag;
-                _pressedItem = null;
+                SelectedValue = tag;
                 e.Handled = true;
             }
         }
