From b8c057dee3691b27cca37282faef4c067264191b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8A=BC?= Date: Thu, 18 Jul 2024 20:03:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20DatePicker=20DateRangePick?= =?UTF-8?q?er=20=E6=97=A5=E5=8E=86=E6=8C=89=E9=92=AE=E6=97=A0=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E9=97=AE=E9=A2=98=20https://github.com/irihi?= =?UTF-8?q?tech/Ursa.Avalonia/issues/292?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Ursa/Controls/DateTimePicker/DatePicker.cs | 2 +- src/Ursa/Controls/DateTimePicker/DateRangePicker.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Ursa/Controls/DateTimePicker/DatePicker.cs b/src/Ursa/Controls/DateTimePicker/DatePicker.cs index 7a33f98..eef47d9 100644 --- a/src/Ursa/Controls/DateTimePicker/DatePicker.cs +++ b/src/Ursa/Controls/DateTimePicker/DatePicker.cs @@ -82,7 +82,7 @@ public class DatePicker: DatePickerBase, IClearControl _textBox = e.NameScope.Find(PART_TextBox); _calendar = e.NameScope.Find(PART_Calendar); - Button.ClickEvent.AddHandler(OnButtonClick, RoutingStrategies.Tunnel, true, _button); + Button.ClickEvent.AddHandler(OnButtonClick, RoutingStrategies.Bubble, true, _button); GotFocusEvent.AddHandler(OnTextBoxGetFocus, _textBox); TextBox.TextChangedEvent.AddHandler(OnTextChanged, _textBox); PointerPressedEvent.AddHandler(OnTextBoxPointerPressed, RoutingStrategies.Tunnel, false, _textBox); diff --git a/src/Ursa/Controls/DateTimePicker/DateRangePicker.cs b/src/Ursa/Controls/DateTimePicker/DateRangePicker.cs index 48b3758..aa7ca22 100644 --- a/src/Ursa/Controls/DateTimePicker/DateRangePicker.cs +++ b/src/Ursa/Controls/DateTimePicker/DateRangePicker.cs @@ -128,7 +128,7 @@ public class DateRangePicker : DatePickerBase _startTextBox = e.NameScope.Find(PART_StartTextBox); _endTextBox = e.NameScope.Find(PART_EndTextBox); - Button.ClickEvent.AddHandler(OnButtonClick, RoutingStrategies.Tunnel, true, _button); + Button.ClickEvent.AddHandler(OnButtonClick, RoutingStrategies.Bubble, true, _button); GotFocusEvent.AddHandler(OnTextBoxGetFocus, _startTextBox, _endTextBox); TextBox.TextChangedEvent.AddHandler(OnTextChanged, _startTextBox, _endTextBox); PointerPressedEvent.AddHandler(OnTextBoxPointerPressed, RoutingStrategies.Tunnel, false, _startTextBox, _endTextBox);