From 341ac8be040ca5402f5a377d62f95c208225f1ce Mon Sep 17 00:00:00 2001 From: rabbitism Date: Thu, 18 Jul 2024 21:02:39 +0800 Subject: [PATCH] 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}" />