Browse Source

Fixed no longer existing selectors in CheckBox and Calendar themes (#14851)

pull/14856/head
Bartosz Korczyński 2 years ago
committed by GitHub
parent
commit
b3212b99b5
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 8
      src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
  2. 8
      src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
  3. 4
      src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
  4. 18
      src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
  5. 2
      src/Avalonia.Themes.Simple/Controls/CalendarButton.xaml
  6. 6
      src/Avalonia.Themes.Simple/Controls/CalendarDayButton.xaml

8
src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml

@ -69,7 +69,7 @@
<Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedBorderBrush}" />
</Style>
<Style Selector="^ /template/ ContentPresenter#Content">
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}" />
<Setter Property="FontWeight" Value="{DynamicResource CalendarViewTodayFontWeight}" />
</Style>
@ -100,16 +100,16 @@
<!-- These are probably set in code, but consistent -->
<Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}"/>
</Style>
<Style Selector="^ /template/ ContentControl#Content">
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}"/>
</Style>
</Style>
<Style Selector="^:blackout /template/ ContentControl#Content">
<Style Selector="^:blackout /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CalendarViewBlackoutForeground}" />
</Style>
<Style Selector="^:disabled /template/ ContentControl#Content">
<Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}" />
</Style>
</ControlTheme>

8
src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml

@ -84,7 +84,7 @@
<Style Selector="^:pressed /template/ Border#Border">
<Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark2}" />
</Style>
<Style Selector="^ ContentControl#Content">
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}" />
<Setter Property="FontWeight" Value="SemiBold" />
</Style>
@ -95,16 +95,16 @@
<Style Selector="^ /template/ Border#Root">
<Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}" />
</Style>
<Style Selector="^ /template/ ContentControl#Content">
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}" />
</Style>
</Style>
<Style Selector="^:blackout /template/ ContentControl#Content">
<Style Selector="^:blackout /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CalendarViewBlackoutForeground}" />
</Style>
<Style Selector="^:disabled /template/ ContentControl#Content">
<Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}" />
</Style>
</ControlTheme>

4
src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml

@ -41,11 +41,11 @@
</ControlTemplate>
</Setter>
<Style Selector="^:pointerover /template/ ContentPresenter#Text">
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="BorderBrush" Value="{DynamicResource CalendarViewNavigationButtonBorderBrushPointerOver}" />
<Setter Property="Foreground" Value="{DynamicResource CalendarViewNavigationButtonForegroundPointerOver}" />
</Style>
<Style Selector="^:pressed /template/ ContentPresenter#Text">
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CalendarViewNavigationButtonForegroundPressed}" />
</Style>
<Style Selector="^:disabled /template/ ContentPresenter">

18
src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml

@ -72,7 +72,7 @@
<!-- Unchecked PointerOver State -->
<Style Selector="^:pointerover">
<Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPointerOver}" />
</Style>
@ -93,7 +93,7 @@
<!-- Unchecked Pressed State -->
<Style Selector="^:pressed">
<Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPressed}" />
</Style>
@ -114,7 +114,7 @@
<!-- Unchecked Disabled state -->
<Style Selector="^:disabled">
<Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedDisabled}" />
</Style>
@ -153,7 +153,7 @@
<!-- Checked PointerOver State -->
<Style Selector="^:pointerover">
<Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPointerOver}" />
</Style>
@ -174,7 +174,7 @@
<!-- Checked Pressed State -->
<Style Selector="^:pressed">
<Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPressed}" />
</Style>
@ -195,7 +195,7 @@
<!-- Checked Disabled State -->
<Style Selector="^:disabled">
<Style Selector="^ ContentPresenter#ContentPresenter">
<Style Selector="^ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedDisabled}" />
</Style>
@ -235,7 +235,7 @@
<!-- Indeterminate PointerOver State -->
<Style Selector="^:pointerover">
<Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePointerOver}" />
</Style>
@ -256,7 +256,7 @@
<!-- Indeterminate Pressed State -->
<Style Selector="^:pressed">
<Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePressed}" />
</Style>
@ -277,7 +277,7 @@
<!-- Indeterminate Disabled State -->
<Style Selector="^:disabled">
<Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminateDisabled}" />
</Style>

2
src/Avalonia.Themes.Simple/Controls/CalendarButton.xaml

@ -63,7 +63,7 @@
<Setter Property="IsVisible" Value="True" />
</Style>
<Style Selector="^:inactive /template/ ContentPresenter#Content">
<Style Selector="^:inactive /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
</Style>

6
src/Avalonia.Themes.Simple/Controls/CalendarDayButton.xaml

@ -80,7 +80,7 @@
<Style Selector="^:disabled /template/ Rectangle#Background">
<Setter Property="IsVisible" Value="False" />
</Style>
<Style Selector="^:disabled /template/ ContentControl#Content">
<Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Opacity" Value="0.3" />
</Style>
@ -92,10 +92,10 @@
<Setter Property="IsVisible" Value="True" />
</Style>
<Style Selector="^:inactive /template/ ContentControl#Content">
<Style Selector="^:inactive /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
</Style>
<Style Selector="^:today /template/ ContentControl#Content">
<Style Selector="^:today /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource ThemeControlLowBrush}" />
</Style>

Loading…
Cancel
Save