From f8a43fd1261c5d7057f51b73663eda47f3bc683d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8A=BC?= Date: Thu, 18 Jul 2024 19:23:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix=20CalendarDayButton.DatePreviewed=20?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=88=B0=20DateSelectedEvent=20=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Ursa/Controls/DateTimePicker/CalendarDayButton.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Ursa/Controls/DateTimePicker/CalendarDayButton.cs b/src/Ursa/Controls/DateTimePicker/CalendarDayButton.cs index cec8c74..a4bdb5a 100644 --- a/src/Ursa/Controls/DateTimePicker/CalendarDayButton.cs +++ b/src/Ursa/Controls/DateTimePicker/CalendarDayButton.cs @@ -165,8 +165,8 @@ public class CalendarDayButton : ContentControl public event EventHandler DatePreviewed { - add => AddHandler(DateSelectedEvent, value); - remove => RemoveHandler(DateSelectedEvent, value); + add => AddHandler(DatePreviewedEvent, value); + remove => RemoveHandler(DatePreviewedEvent, value); } protected override void OnPointerReleased(PointerReleasedEventArgs e) From d24ced3b0d42a1d943fb69e1a9ac79ad6631e565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8A=BC?= Date: Thu, 18 Jul 2024 19:34:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=20DatePicker=20?= =?UTF-8?q?=E5=92=8C=20DateRangePicker=20=20FontSize=20=E5=9C=A8=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E6=A1=86=E4=B8=8A=E6=9C=AA=E7=94=9F=E6=95=88=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/Ursa.Demo/Pages/DatePickerDemo.axaml | 4 ++-- src/Ursa.Themes.Semi/Controls/DatePicker.axaml | 3 ++- src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/demo/Ursa.Demo/Pages/DatePickerDemo.axaml b/demo/Ursa.Demo/Pages/DatePickerDemo.axaml index 65094c1..039389f 100644 --- a/demo/Ursa.Demo/Pages/DatePickerDemo.axaml +++ b/demo/Ursa.Demo/Pages/DatePickerDemo.axaml @@ -8,7 +8,7 @@ - - + + diff --git a/src/Ursa.Themes.Semi/Controls/DatePicker.axaml b/src/Ursa.Themes.Semi/Controls/DatePicker.axaml index 05c1357..eb5542a 100644 --- a/src/Ursa.Themes.Semi/Controls/DatePicker.axaml +++ b/src/Ursa.Themes.Semi/Controls/DatePicker.axaml @@ -42,6 +42,7 @@ BorderBrush="Transparent" BorderThickness="0" CornerRadius="{TemplateBinding CornerRadius}" + FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" InnerLeftContent="{TemplateBinding InnerLeftContent}" InnerRightContent="{TemplateBinding InnerRightContent}" @@ -76,8 +77,8 @@ Padding="8" Background="{DynamicResource ComboBoxPopupBackground}" BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}" - BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}" BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}" + BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}" CornerRadius="{DynamicResource CalendarCornerRadius}"> @@ -50,6 +51,7 @@ VerticalAlignment="Stretch" Background="Transparent" CornerRadius="0" + FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" InnerRightContent="{TemplateBinding InnerRightContent}" IsReadOnly="{TemplateBinding IsReadonly}" /> 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 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20DatePicker=20DateRange?= =?UTF-8?q?Picker=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); From 341ac8be040ca5402f5a377d62f95c208225f1ce Mon Sep 17 00:00:00 2001 From: rabbitism Date: Thu, 18 Jul 2024 21:02:39 +0800 Subject: [PATCH 4/4] feat: explicitly assign fontsize to calendar view. remove font size from demo. --- demo/Ursa.Demo/Pages/DatePickerDemo.axaml | 4 ++-- src/Ursa.Themes.Semi/Controls/DatePicker.axaml | 1 + src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/demo/Ursa.Demo/Pages/DatePickerDemo.axaml b/demo/Ursa.Demo/Pages/DatePickerDemo.axaml index 039389f..bcf1797 100644 --- a/demo/Ursa.Demo/Pages/DatePickerDemo.axaml +++ b/demo/Ursa.Demo/Pages/DatePickerDemo.axaml @@ -8,7 +8,7 @@ - - + + diff --git a/src/Ursa.Themes.Semi/Controls/DatePicker.axaml b/src/Ursa.Themes.Semi/Controls/DatePicker.axaml index eb5542a..518c63c 100644 --- a/src/Ursa.Themes.Semi/Controls/DatePicker.axaml +++ b/src/Ursa.Themes.Semi/Controls/DatePicker.axaml @@ -83,6 +83,7 @@ diff --git a/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml b/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml index 9958465..dab0c1f 100644 --- a/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml +++ b/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml @@ -119,6 +119,7 @@ Grid.Column="0" Margin="8" BorderThickness="0" + FontSize="{DynamicResource DefaultFontSize}" CornerRadius="{Binding $parent[Border].CornerRadius}" FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}" IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}" /> @@ -127,6 +128,7 @@ Grid.Column="1" Margin="8" BorderThickness="0" + FontSize="{DynamicResource DefaultFontSize}" CornerRadius="{Binding $parent[Border].CornerRadius}" FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}" IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}" />