Browse Source
Merge pull request #7365 from amwx/FixCalendarHeaderAlignment
[Calendar] Fix vertical alignments
pull/7373/head
Max Katz
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
3 additions and
2 deletions
-
src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
-
src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
-
src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
|
|
@ -11,7 +11,7 @@ |
|
|
<Setter Property="MinWidth" Value="40"/> |
|
|
<Setter Property="MinWidth" Value="40"/> |
|
|
<Setter Property="MinHeight" Value="40"/> |
|
|
<Setter Property="MinHeight" Value="40"/> |
|
|
<Setter Property="Margin" Value="1"/> |
|
|
<Setter Property="Margin" Value="1"/> |
|
|
<Setter Property="Padding" Value="0,0,0,4"/> |
|
|
<Setter Property="Padding" Value="0,0,0,0"/> |
|
|
<!--These are actually set on the CalendarView in WinUI--> |
|
|
<!--These are actually set on the CalendarView in WinUI--> |
|
|
<Setter Property="Foreground" Value="{DynamicResource CalendarViewCalendarItemForeground}"/> |
|
|
<Setter Property="Foreground" Value="{DynamicResource CalendarViewCalendarItemForeground}"/> |
|
|
<Setter Property="Background" Value="{DynamicResource CalendarViewCalendarItemRevealBackground}"/> |
|
|
<Setter Property="Background" Value="{DynamicResource CalendarViewCalendarItemRevealBackground}"/> |
|
|
|
|
|
@ -11,7 +11,7 @@ |
|
|
<Setter Property="MinWidth" Value="40"/> |
|
|
<Setter Property="MinWidth" Value="40"/> |
|
|
<Setter Property="MinHeight" Value="40"/> |
|
|
<Setter Property="MinHeight" Value="40"/> |
|
|
<Setter Property="Margin" Value="1"/> |
|
|
<Setter Property="Margin" Value="1"/> |
|
|
<Setter Property="Padding" Value="0,0,0,4"/> |
|
|
<Setter Property="Padding" Value="0,0,0,0"/> |
|
|
<!--These are actually set on the CalendarView in WinUI--> |
|
|
<!--These are actually set on the CalendarView in WinUI--> |
|
|
<Setter Property="Foreground" Value="{DynamicResource CalendarViewCalendarItemForeground}"/> |
|
|
<Setter Property="Foreground" Value="{DynamicResource CalendarViewCalendarItemForeground}"/> |
|
|
<Setter Property="Background" Value="{DynamicResource CalendarViewCalendarItemRevealBackground}"/> |
|
|
<Setter Property="Background" Value="{DynamicResource CalendarViewCalendarItemRevealBackground}"/> |
|
|
|
|
|
@ -32,6 +32,7 @@ |
|
|
<Style Selector="Button.CalendarHeader"> |
|
|
<Style Selector="Button.CalendarHeader"> |
|
|
<Setter Property="HorizontalAlignment" Value="Stretch" /> |
|
|
<Setter Property="HorizontalAlignment" Value="Stretch" /> |
|
|
<Setter Property="VerticalAlignment" Value="Stretch" /> |
|
|
<Setter Property="VerticalAlignment" Value="Stretch" /> |
|
|
|
|
|
<Setter Property="VerticalContentAlignment" Value="Center" /> |
|
|
<Setter Property="FontSize" Value="20" /> |
|
|
<Setter Property="FontSize" Value="20" /> |
|
|
<Setter Property="Background" Value="{DynamicResource CalendarViewNavigationButtonBackground}"/> |
|
|
<Setter Property="Background" Value="{DynamicResource CalendarViewNavigationButtonBackground}"/> |
|
|
<Setter Property="Template"> |
|
|
<Setter Property="Template"> |
|
|
|
