feat: Add Size to date and time picker.
This commit is contained in:
parent
df217f3c82
commit
6e5512e429
@ -11,5 +11,7 @@
|
|||||||
<DatePicker />
|
<DatePicker />
|
||||||
<DatePicker DayFormat="d (ddd)" YearVisible="False" />
|
<DatePicker DayFormat="d (ddd)" YearVisible="False" />
|
||||||
<DatePicker IsEnabled="False" />
|
<DatePicker IsEnabled="False" />
|
||||||
|
<DatePicker Classes="Large" />
|
||||||
|
<DatePicker Classes="Small" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
@ -12,5 +12,7 @@
|
|||||||
<TimePicker MinuteIncrement="15" />
|
<TimePicker MinuteIncrement="15" />
|
||||||
<TimePicker ClockIdentifier="24HourClock" />
|
<TimePicker ClockIdentifier="24HourClock" />
|
||||||
<TimePicker ClockIdentifier="12HourClock" IsEnabled="False" />
|
<TimePicker ClockIdentifier="12HourClock" IsEnabled="False" />
|
||||||
|
<TimePicker Classes="Large" />
|
||||||
|
<TimePicker Classes="Small" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
@ -124,13 +124,12 @@
|
|||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
|
|
||||||
<ControlTheme x:Key="{x:Type DatePicker}" TargetType="DatePicker">
|
<ControlTheme x:Key="{x:Type DatePicker}" TargetType="DatePicker">
|
||||||
<Setter Property="FontSize" Value="14" />
|
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonDefaultHeight}" />
|
||||||
<Setter Property="Height" Value="32" />
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerButtonForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerButtonForeground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource DateTimePickerButtonBackground}" />
|
<Setter Property="Background" Value="{DynamicResource DateTimePickerButtonBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerButtonBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerButtonBorderBrush}" />
|
||||||
<Setter Property="BorderThickness" Value="1" />
|
<Setter Property="BorderThickness" Value="{DynamicResource DateTimePickerButtonBorderThickness}" />
|
||||||
<Setter Property="CornerRadius" Value="3" />
|
<Setter Property="CornerRadius" Value="{DynamicResource DateTimePickerButtonCornerRadius}" />
|
||||||
<Setter Property="HorizontalAlignment" Value="Left" />
|
<Setter Property="HorizontalAlignment" Value="Left" />
|
||||||
<Setter Property="VerticalAlignment" Value="Center" />
|
<Setter Property="VerticalAlignment" Value="Center" />
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
@ -230,6 +229,12 @@
|
|||||||
<Style Selector="^:hasnodate /template/ Button#PART_FlyoutButton TextBlock">
|
<Style Selector="^:hasnodate /template/ Button#PART_FlyoutButton TextBlock">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerEmptyForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerEmptyForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
<Style Selector="^.Large">
|
||||||
|
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonLargeHeight}" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^.Small">
|
||||||
|
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonSmallHeight}" />
|
||||||
|
</Style>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
|
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
@ -127,8 +127,7 @@
|
|||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
|
|
||||||
<ControlTheme x:Key="{x:Type TimePicker}" TargetType="TimePicker">
|
<ControlTheme x:Key="{x:Type TimePicker}" TargetType="TimePicker">
|
||||||
<Setter Property="FontSize" Value="14" />
|
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonDefaultHeight}" />
|
||||||
<Setter Property="Height" Value="32" />
|
|
||||||
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerButtonForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerButtonForeground}" />
|
||||||
<Setter Property="Background" Value="{DynamicResource DateTimePickerButtonBackground}" />
|
<Setter Property="Background" Value="{DynamicResource DateTimePickerButtonBackground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerButtonBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerButtonBorderBrush}" />
|
||||||
@ -248,5 +247,12 @@
|
|||||||
<Style Selector="^:hasnotime /template/ Button#PART_FlyoutButton TextBlock">
|
<Style Selector="^:hasnotime /template/ Button#PART_FlyoutButton TextBlock">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerEmptyForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerEmptyForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
|
<Style Selector="^.Large">
|
||||||
|
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonLargeHeight}" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^.Small">
|
||||||
|
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonSmallHeight}" />
|
||||||
|
</Style>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
@ -39,4 +39,11 @@
|
|||||||
<Thickness x:Key="DateTimePickerFlyoutPadding">16 0</Thickness>
|
<Thickness x:Key="DateTimePickerFlyoutPadding">16 0</Thickness>
|
||||||
<Thickness x:Key="DateTimePickerFlyoutBorderMargin">8</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>
|
</ResourceDictionary>
|
||||||
|
@ -39,4 +39,10 @@
|
|||||||
<Thickness x:Key="DateTimePickerFlyoutPadding">16 0</Thickness>
|
<Thickness x:Key="DateTimePickerFlyoutPadding">16 0</Thickness>
|
||||||
<Thickness x:Key="DateTimePickerFlyoutBorderMargin">8</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>
|
</ResourceDictionary>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user