chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复 DatePicker 和 DateRangePicker FontSize 在文本框上未生效的问题

Browse Source
This commit is contained in:
杨劼
2024-07-18 19:34:32 +08:00
parent f8a43fd126
commit d24ced3b0d
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
demo/Ursa.Demo/Pages/DatePickerDemo.axaml
View File

@@ -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>

3
src/Ursa.Themes.Semi/Controls/DatePicker.axaml
View File

@@ -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"

2
src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml
View File

@@ -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}" />