From c656c4fff62f6cd9dd8fb3098c96cff6b611eceb Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 18 Mar 2022 14:47:19 +0000 Subject: [PATCH] fix using touch for date/time pickers. --- .../DateTimePickers/DateTimePickerPanel.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs index 5948d81810..cf032e1a00 100644 --- a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs +++ b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs @@ -2,6 +2,7 @@ using System.Globalization; using System.Linq; using Avalonia.Input; +using Avalonia.Media; using Avalonia.VisualTree; namespace Avalonia.Controls.Primitives @@ -63,13 +64,14 @@ namespace Avalonia.Controls.Primitives public DateTimePickerPanel() { FormatDate = DateTime.Now; - AddHandler(ListBoxItem.PointerPressedEvent, OnItemPointerDown, Avalonia.Interactivity.RoutingStrategies.Bubble); - AddHandler(ListBoxItem.PointerReleasedEvent, OnItemPointerUp, Avalonia.Interactivity.RoutingStrategies.Bubble); + AddHandler(PointerPressedEvent, OnItemPointerDown, Avalonia.Interactivity.RoutingStrategies.Bubble); + AddHandler(PointerReleasedEvent, OnItemPointerUp, Avalonia.Interactivity.RoutingStrategies.Bubble); } static DateTimePickerPanel() { FocusableProperty.OverrideDefaultValue(true); + BackgroundProperty.OverrideDefaultValue(Brushes.Transparent); AffectsMeasure(ItemHeightProperty); } @@ -529,7 +531,6 @@ namespace Avalonia.Controls.Primitives e.Source is IVisual source) { _pressedItem = GetItemFromSource(source); - e.Handled = true; } } @@ -543,7 +544,6 @@ namespace Avalonia.Controls.Primitives { SelectedValue = tag; _pressedItem = null; - e.Handled = true; } }