zhaoyushun1999/Semi.Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add Size to date and time picker.

Browse Source
This commit is contained in:
rabbitism 2023-02-17 00:31:31 +08:00
parent df217f3c82
commit 6e5512e429
6 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/Semi.Avalonia.Demo/Pages/DatePickerDemo.axaml
View File

@ -11,5 +11,7 @@
<DatePicker />
<DatePicker DayFormat="d (ddd)" YearVisible="False" />
<DatePicker IsEnabled="False" />
<DatePicker Classes="Large" />
<DatePicker Classes="Small" />
</StackPanel>
</UserControl>

2
demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml
View File

@ -12,5 +12,7 @@
<TimePicker MinuteIncrement="15" />
<TimePicker ClockIdentifier="24HourClock" />
<TimePicker ClockIdentifier="12HourClock" IsEnabled="False" />
<TimePicker Classes="Large" />
<TimePicker Classes="Small" />
</StackPanel>
</UserControl>

13
src/Semi.Avalonia/Controls/DatePicker.axaml
View File

@ -124,13 +124,12 @@
</ControlTheme>
<ControlTheme x:Key="{x:Type DatePicker}" TargetType="DatePicker">
<Setter Property="FontSize" Value="14" />
<Setter Property="Height" Value="32" />
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonDefaultHeight}" />
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerButtonForeground}" />
<Setter Property="Background" Value="{DynamicResource DateTimePickerButtonBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerButtonBorderBrush}" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="CornerRadius" Value="3" />
<Setter Property="BorderThickness" Value="{DynamicResource DateTimePickerButtonBorderThickness}" />
<Setter Property="CornerRadius" Value="{DynamicResource DateTimePickerButtonCornerRadius}" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Template">
@ -230,6 +229,12 @@
<Style Selector="^:hasnodate /template/ Button#PART_FlyoutButton TextBlock">
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerEmptyForeground}" />
</Style>
<Style Selector="^.Large">
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonLargeHeight}" />
</Style>
<Style Selector="^.Small">
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonSmallHeight}" />
</Style>
</ControlTheme>
</ResourceDictionary>

10
src/Semi.Avalonia/Controls/TimePicker.axaml
View File

@ -127,8 +127,7 @@
</ControlTheme>
<ControlTheme x:Key="{x:Type TimePicker}" TargetType="TimePicker">
<Setter Property="FontSize" Value="14" />
<Setter Property="Height" Value="32" />
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonDefaultHeight}" />
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerButtonForeground}" />
<Setter Property="Background" Value="{DynamicResource DateTimePickerButtonBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerButtonBorderBrush}" />
@ -248,5 +247,12 @@
<Style Selector="^:hasnotime /template/ Button#PART_FlyoutButton TextBlock">
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerEmptyForeground}" />
</Style>
<Style Selector="^.Large">
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonLargeHeight}" />
</Style>
<Style Selector="^.Small">
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonSmallHeight}" />
</Style>
</ControlTheme>
</ResourceDictionary>

7
src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
View File

@ -39,4 +39,11 @@
<Thickness x:Key="DateTimePickerFlyoutPadding">16 0</Thickness>
<Thickness x:Key="DateTimePickerFlyoutBorderMargin">8</Thickness>
<x:Double x:Key="DateTimePickerButtonSmallHeight">24</x:Double>
<x:Double x:Key="DateTimePickerButtonDefaultHeight">32</x:Double>
<x:Double x:Key="DateTimePickerButtonLargeHeight">40</x:Double>
<Thickness x:Key="DateTimePickerButtonBorderThickness">1</Thickness>
<CornerRadius x:Key="DateTimePickerButtonCornerRadius">3</CornerRadius>
</ResourceDictionary>

6
src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
View File

@ -39,4 +39,10 @@
<Thickness x:Key="DateTimePickerFlyoutPadding">16 0</Thickness>
<Thickness x:Key="DateTimePickerFlyoutBorderMargin">8</Thickness>
<x:Double x:Key="DateTimePickerButtonSmallHeight">24</x:Double>
<x:Double x:Key="DateTimePickerButtonDefaultHeight">32</x:Double>
<x:Double x:Key="DateTimePickerButtonLargeHeight">40</x:Double>
<Thickness x:Key="DateTimePickerButtonBorderThickness">1</Thickness>
<CornerRadius x:Key="DateTimePickerButtonCornerRadius">3</CornerRadius>
</ResourceDictionary>