From d24ced3b0d42a1d943fb69e1a9ac79ad6631e565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=8A=BC?= <yangjie123098@live.cn>
Date: Thu, 18 Jul 2024 19:34:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=20DatePicker=20=E5=92=8C?=
 =?UTF-8?q?=20DateRangePicker=20=20FontSize=20=E5=9C=A8=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E6=A1=86=E4=B8=8A=E6=9C=AA=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=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 @@
     <StackPanel Margin="20" HorizontalAlignment="Left">
         <u:CalendarView DateSelected="CalendarView_OnOnDateSelected" DatePreviewed="CalendarView_OnOnDatePreviewed"/>
         <TextBlock Text="{Binding #singlePicker.SelectedDate}" ></TextBlock>
-        <u:DatePicker Name="singlePicker" Width="200"  />
-        <u:DateRangePicker Width="300" DisplayFormat="yyyyMMdd" />
+        <u:DatePicker Name="singlePicker" Width="200" FontSize="20"/>
+        <u:DateRangePicker Width="300" DisplayFormat="yyyyMMdd" FontSize="20" />
     </StackPanel>
 </UserControl>
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}">
                                     <u:CalendarView
                                         Name="PART_Calendar"
diff --git a/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml b/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml
index 019c573..9958465 100644
--- a/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml
+++ b/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml
@@ -35,6 +35,7 @@
                                 Background="Transparent"
                                 BorderThickness="1"
                                 CornerRadius="3 0 0 3"
+                                FontSize="{TemplateBinding FontSize}"
                                 Foreground="{TemplateBinding Foreground}"
                                 InnerLeftContent="{TemplateBinding InnerLeftContent}"
                                 IsReadOnly="{TemplateBinding IsReadonly}" />
@@ -50,6 +51,7 @@
                                 VerticalAlignment="Stretch"
                                 Background="Transparent"
                                 CornerRadius="0"
+                                FontSize="{TemplateBinding FontSize}"
                                 Foreground="{TemplateBinding Foreground}"
                                 InnerRightContent="{TemplateBinding InnerRightContent}"
                                 IsReadOnly="{TemplateBinding IsReadonly}" />