Skip to content

Commit 48d7dc9

Browse files
committed
Some cleanups in Clock and DatePicker styles
1 parent 09867be commit 48d7dc9

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

Material.Styles/Controls/Clock.axaml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@
4545
Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right"
4646
Classes="time-input" Focusable="False"
4747
assists:TextFieldAssist.Hints="{DynamicResource StringClockHourHintText}"
48-
ShowButtonSpinner="False" ClipValueToMinMax="True"
49-
FormatString="0"
48+
ClipValueToMinMax="True"
5049
Minimum="{TemplateBinding TimeFormat, Converter={x:Static converters:AmPmRangeConverter.MinimumInstance}}"
5150
Maximum="{TemplateBinding TimeFormat, Converter={x:Static converters:AmPmRangeConverter.MaximumInstance}}"
5251
Value="{TemplateBinding controls:ClockInternals.Hours, Converter={x:Static converters:Int32ToDecimalConverter.Instance}, Mode=TwoWay}" />
@@ -59,9 +58,7 @@
5958
Grid.Row="0" Grid.Column="2" HorizontalAlignment="Left"
6059
Classes="time-input" Focusable="False"
6160
assists:TextFieldAssist.Hints="{DynamicResource StringClockMinuteHintText}"
62-
ShowButtonSpinner="False" ClipValueToMinMax="True"
63-
FormatString="0"
64-
Minimum="0" Maximum="59"
61+
ClipValueToMinMax="True" Minimum="0" Maximum="59"
6562
Value="{TemplateBinding controls:ClockInternals.Minutes, Converter={x:Static converters:Int32ToDecimalConverter.Instance}, Mode=TwoWay}" />
6663
<TextBlock x:Name="PART_MinutesSecondsSeparator"
6764
Grid.Row="0" Grid.Column="3"
@@ -74,9 +71,7 @@
7471
Classes="time-input" Focusable="False"
7572
IsVisible="{TemplateBinding CanSelectSeconds}"
7673
assists:TextFieldAssist.Hints="{DynamicResource StringClockSecondsHintText}"
77-
ShowButtonSpinner="False" ClipValueToMinMax="True"
78-
FormatString="0"
79-
Minimum="0" Maximum="59"
74+
ClipValueToMinMax="True" Minimum="0" Maximum="59"
8075
Value="{TemplateBinding controls:ClockInternals.Seconds, Converter={x:Static converters:Int32ToDecimalConverter.Instance}, Mode=TwoWay}" />
8176

8277
<Border x:Name="PART_AmPmSelector" Grid.Row="0" Grid.Column="5"
@@ -128,6 +123,9 @@
128123
<Style Selector="^ /template/ NumericUpDown.time-input">
129124
<Setter Property="Theme" Value="{StaticResource OutlineNumericUpDown}" />
130125
<Setter Property="Width" Value="96" />
126+
<Setter Property="FontSize" Value="30" />
127+
<Setter Property="FormatString" Value="0" />
128+
<Setter Property="ShowButtonSpinner" Value="False" />
131129
<Style Selector="^.active">
132130
<Setter Property="Background" Value="{DynamicResource MaterialDividerBrush}" />
133131
<Setter Property="Foreground" Value="{DynamicResource MaterialPrimaryMidBrush}" />

Material.Styles/Resources/Themes/DatePicker.axaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@
5555
<Popup Name="PART_CalendarPopup"
5656
IsOpen="{Binding #CalendarButton.IsChecked, Mode=TwoWay}">
5757
<controls:Card Name="PART_Card" Padding="8">
58-
<Calendar
59-
SelectedDate="{TemplateBinding SelectedDate,
58+
<Calendar SelectedDate="{TemplateBinding SelectedDate,
6059
Mode=TwoWay, Converter={x:Static converters:DateTimeOffsetConverter.Instance}}" />
6160
</controls:Card>
6261
</Popup>
@@ -89,8 +88,8 @@
8988
<Setter Property="SelectionMode" Value="MultipleRange" />
9089
</Style>
9190
</ControlTheme>
92-
91+
9392
<!-- Default theme -->
94-
<ControlTheme x:Key="{x:Type DatePicker}" TargetType="DatePicker"
93+
<ControlTheme x:Key="{x:Type DatePicker}" TargetType="DatePicker"
9594
BasedOn="{StaticResource MaterialDatePicker}" />
96-
</ResourceDictionary>
95+
</ResourceDictionary>

0 commit comments

Comments
 (0)