Browse Source

Fix TimePicker to respect custom Width property (#20507)

* Fix TimePicker to respect Width by removing MinWidth from internal Button

* Add MinWidth to DatePicker for consistency
pull/20513/head
Evan 2 weeks ago
committed by GitHub
parent
commit
65adcde081
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 1
      src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
  2. 6
      src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml

1
src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml

@ -93,6 +93,7 @@
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}"
IsEnabled="{TemplateBinding IsEnabled}"
MinWidth="{TemplateBinding MinWidth}"
MaxWidth="{TemplateBinding MaxWidth}"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"

6
src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml

@ -78,6 +78,8 @@
<Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="MinWidth" Value="{DynamicResource TimePickerThemeMinWidth}" />
<Setter Property="MaxWidth" Value="{DynamicResource TimePickerThemeMaxWidth}" />
<Setter Property="Template">
<ControlTemplate>
<DataValidationErrors>
@ -90,8 +92,8 @@
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}"
IsEnabled="{TemplateBinding IsEnabled}"
MinWidth="{DynamicResource TimePickerThemeMinWidth}"
MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
MinWidth="{TemplateBinding MinWidth}"
MaxWidth="{TemplateBinding MaxWidth}"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch">

Loading…
Cancel
Save