tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Remove trailing /template/ selectors.

pull/8479/head
Steven Kirk 4 years ago
parent
2b3608078e
commit
afe3486e9f
7 changed files with 113 additions and 117 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
  2. 12
      src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
  3. 6
      src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
  4. 88
      src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
  5. 50
      src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
  6. 56
      src/Avalonia.Themes.Fluent/Controls/Slider.xaml
  7. 6
      src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml

12
src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
View File

@ -87,20 +87,20 @@
<Setter Property="BorderBrush" Value="{DynamicResource SystemErrorTextColor}" /> <Setter Property="BorderBrush" Value="{DynamicResource SystemErrorTextColor}" />
</Style> </Style>
<Style Selector="^:left /template/"> <Style Selector="^:left">
<Style Selector="^ StackPanel#PART_SpinnerPanel"> <Style Selector="^ /template/ StackPanel#PART_SpinnerPanel">
<Setter Property="Grid.Column" Value="0" /> <Setter Property="Grid.Column" Value="0" />
</Style> </Style>
<Style Selector="^ RepeatButton.ButtonSpinnerRepeatButton"> <Style Selector="^ /template/ RepeatButton.ButtonSpinnerRepeatButton">
<Setter Property="BorderThickness" Value="{Binding $parent[ButtonSpinner].BorderThickness, Converter={StaticResource ButtonSpinner_OnlyRightThinknessConverter}}" /> <Setter Property="BorderThickness" Value="{Binding $parent[ButtonSpinner].BorderThickness, Converter={StaticResource ButtonSpinner_OnlyRightThinknessConverter}}" />
</Style> </Style>
</Style> </Style>
<Style Selector="^:right /template/"> <Style Selector="^:right">
<Style Selector="^ StackPanel#PART_SpinnerPanel"> <Style Selector="^ /template/ StackPanel#PART_SpinnerPanel">
<Setter Property="Grid.Column" Value="2" /> <Setter Property="Grid.Column" Value="2" />
</Style> </Style>
<Style Selector="^ RepeatButton.ButtonSpinnerRepeatButton"> <Style Selector="^ /template/ RepeatButton.ButtonSpinnerRepeatButton">
<Setter Property="BorderThickness" Value="{Binding $parent[ButtonSpinner].BorderThickness, Converter={StaticResource ButtonSpinner_OnlyLeftThinknessConverter}}" /> <Setter Property="BorderThickness" Value="{Binding $parent[ButtonSpinner].BorderThickness, Converter={StaticResource ButtonSpinner_OnlyLeftThinknessConverter}}" />
</Style> </Style>
</Style> </Style>

12
src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
View File

@ -106,13 +106,13 @@
<Setter Property="BorderBrush" Value="Transparent"/> <Setter Property="BorderBrush" Value="Transparent"/>
<Setter Property="BorderThickness" Value="0" /> <Setter Property="BorderThickness" Value="0" />
</Style> </Style>
<Style Selector="TextBox#PART_TextBox:disabled /template/"> <Style Selector="TextBox#PART_TextBox:disabled">
<Style Selector="^ Border#PART_BorderElement"> <Style Selector="^ /template/ Border#PART_BorderElement">
<!-- By default the TextBox has its own disabled state, override this to make the border background show through --> <!-- By default the TextBox has its own disabled state, override this to make the border background show through -->
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="Transparent" /> <Setter Property="BorderBrush" Value="Transparent" />
</Style> </Style>
<Style Selector="^ TextBlock#PART_Watermark, ^ TextBlock#PART_FloatingWatermark"> <Style Selector="^ /template/ TextBlock#PART_Watermark, ^ TextBlock#PART_FloatingWatermark">
<Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerTextForegroundDisabled}" /> <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerTextForegroundDisabled}" />
</Style> </Style>
</Style> </Style>
@ -152,13 +152,13 @@
</Style> </Style>
<!-- Disabled State --> <!-- Disabled State -->
<Style Selector="^:disabled /template/"> <Style Selector="^:disabled">
<Style Selector="^ Border#Background"> <Style Selector="^ /template/ Border#Background">
<Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundDisabled}" /> <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundDisabled}" />
<Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushDisabled}" /> <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushDisabled}" />
</Style> </Style>
<Style Selector="^ Button#PART_Button"> <Style Selector="^ /template/ Button#PART_Button">
<Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForegroundDisabled}" /> <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForegroundDisabled}" />
</Style> </Style>

6
src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
View File

@ -84,11 +84,11 @@
</Style> </Style>
<!-- WinUI calls this OutOfFocus --> <!-- WinUI calls this OutOfFocus -->
<Style Selector="^:inactive /template/"> <Style Selector="^:inactive">
<Style Selector="^ Border#Root"> <Style Selector="^ /template/ Border#Root">
<Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}" /> <Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}" />
</Style> </Style>
<Style Selector="^ ContentControl#Content"> <Style Selector="^ /template/ ContentControl#Content">
<Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}" /> <Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}" />
</Style> </Style>
</Style> </Style>

88
src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
View File

@ -63,64 +63,64 @@
</Setter> </Setter>
<!-- Unchecked PointerOver State --> <!-- Unchecked PointerOver State -->
<Style Selector="^:pointerover /template/"> <Style Selector="^:pointerover">
<Style Selector="^ ContentPresenter#ContentPresenter"> <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPointerOver}" /> <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPointerOver}" />
</Style> </Style>
<Style Selector="^ Border#PART_Border"> <Style Selector="^ /template/ Border#PART_Border">
<Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPointerOver}" /> <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPointerOver}" />
<Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPointerOver}" /> <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPointerOver}" />
</Style> </Style>
<Style Selector="^ Border#NormalRectangle"> <Style Selector="^ /template/ Border#NormalRectangle">
<Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPointerOver}" /> <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPointerOver}" />
<Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPointerOver}" /> <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPointerOver}" />
</Style> </Style>
<Style Selector="^ Path#CheckGlyph"> <Style Selector="^ /template/ Path#CheckGlyph">
<Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPointerOver}" /> <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPointerOver}" />
</Style> </Style>
</Style> </Style>
<!-- Unchecked Pressed State --> <!-- Unchecked Pressed State -->
<Style Selector="^:pressed /template/"> <Style Selector="^:pressed">
<Style Selector="^ ContentPresenter#ContentPresenter"> <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPressed}" /> <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPressed}" />
</Style> </Style>
<Style Selector="^ Border#PART_Border"> <Style Selector="^ /template/ Border#PART_Border">
<Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPressed}" /> <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPressed}" />
<Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPressed}" /> <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPressed}" />
</Style> </Style>
<Style Selector="^ Border#NormalRectangle"> <Style Selector="^ /template/ Border#NormalRectangle">
<Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPressed}" /> <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPressed}" />
<Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPressed}" /> <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPressed}" />
</Style> </Style>
<Style Selector="^ Path#CheckGlyph"> <Style Selector="^ /template/ Path#CheckGlyph">
<Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPressed}" /> <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPressed}" />
</Style> </Style>
</Style> </Style>
<!-- Unchecked Disabled state --> <!-- Unchecked Disabled state -->
<Style Selector="^:disabled /template/"> <Style Selector="^:disabled">
<Style Selector="^ ContentPresenter#ContentPresenter"> <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedDisabled}" /> <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedDisabled}" />
</Style> </Style>
<Style Selector="^ Border#PART_Border"> <Style Selector="^ /template/ Border#PART_Border">
<Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedDisabled}" /> <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedDisabled}" />
<Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedDisabled}" /> <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedDisabled}" />
</Style> </Style>
<Style Selector="^ Border#NormalRectangle"> <Style Selector="^ /template/ Border#NormalRectangle">
<Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedDisabled}" /> <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedDisabled}" />
<Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedDisabled}" /> <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedDisabled}" />
</Style> </Style>
<Style Selector="^ Path#CheckGlyph"> <Style Selector="^ /template/ Path#CheckGlyph">
<Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedDisabled}" /> <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedDisabled}" />
</Style> </Style>
</Style> </Style>
@ -145,64 +145,64 @@
</Style> </Style>
<!-- Checked PointerOver State --> <!-- Checked PointerOver State -->
<Style Selector="^:pointerover /template/"> <Style Selector="^:pointerover">
<Style Selector="^ ContentPresenter#ContentPresenter"> <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPointerOver}" /> <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPointerOver}" />
</Style> </Style>
<Style Selector="^ Border#PART_Border"> <Style Selector="^ /template/ Border#PART_Border">
<Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPointerOver}" /> <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPointerOver}" />
<Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPointerOver}" /> <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPointerOver}" />
</Style> </Style>
<Style Selector="^ Border#NormalRectangle"> <Style Selector="^ /template/ Border#NormalRectangle">
<Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPointerOver}" /> <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPointerOver}" />
<Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPointerOver}" /> <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPointerOver}" />
</Style> </Style>
<Style Selector="^ Path#CheckGlyph"> <Style Selector="^ /template/ Path#CheckGlyph">
<Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPointerOver}" /> <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPointerOver}" />
</Style> </Style>
</Style> </Style>
<!-- Checked Pressed State --> <!-- Checked Pressed State -->
<Style Selector="^:pressed /template/"> <Style Selector="^:pressed">
<Style Selector="^ ContentPresenter#ContentPresenter"> <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPressed}" /> <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPressed}" />
</Style> </Style>
<Style Selector="^ Border#PART_Border"> <Style Selector="^ /template/ Border#PART_Border">
<Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPressed}" /> <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPressed}" />
<Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPressed}" /> <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPressed}" />
</Style> </Style>
<Style Selector="^ Border#NormalRectangle"> <Style Selector="^ /template/ Border#NormalRectangle">
<Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPressed}" /> <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPressed}" />
<Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPressed}" /> <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPressed}" />
</Style> </Style>
<Style Selector="^ Path#CheckGlyph"> <Style Selector="^ /template/ Path#CheckGlyph">
<Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPressed}" /> <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPressed}" />
</Style> </Style>
</Style> </Style>
<!-- Checked Disabled State --> <!-- Checked Disabled State -->
<Style Selector="^:disabled /template/"> <Style Selector="^:disabled">
<Style Selector="^ ContentPresenter#ContentPresenter"> <Style Selector="^ ContentPresenter#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedDisabled}" /> <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedDisabled}" />
</Style> </Style>
<Style Selector="^ Border#PART_Border"> <Style Selector="^ /template/ Border#PART_Border">
<Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedDisabled}" /> <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedDisabled}" />
<Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedDisabled}" /> <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedDisabled}" />
</Style> </Style>
<Style Selector="^ Border#NormalRectangle"> <Style Selector="^ /template/ Border#NormalRectangle">
<Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedDisabled}" /> <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedDisabled}" />
<Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedDisabled}" /> <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedDisabled}" />
</Style> </Style>
<Style Selector="^ Path#CheckGlyph"> <Style Selector="^ /template/ Path#CheckGlyph">
<Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedDisabled}" /> <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedDisabled}" />
</Style> </Style>
</Style> </Style>
@ -227,64 +227,64 @@
</Style> </Style>
<!-- Indeterminate PointerOver State --> <!-- Indeterminate PointerOver State -->
<Style Selector="^:pointerover /template/"> <Style Selector="^:pointerover">
<Style Selector="^ ContentPresenter#ContentPresenter"> <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePointerOver}" /> <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePointerOver}" />
</Style> </Style>
<Style Selector="^ Border#PART_Border"> <Style Selector="^ /template/ Border#PART_Border">
<Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePointerOver}" /> <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePointerOver}" />
<Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePointerOver}" /> <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePointerOver}" />
</Style> </Style>
<Style Selector="^ Border#NormalRectangle"> <Style Selector="^ /template/ Border#NormalRectangle">
<Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePointerOver}" /> <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePointerOver}" />
<Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePointerOver}" /> <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePointerOver}" />
</Style> </Style>
<Style Selector="^ Path#CheckGlyph"> <Style Selector="^ /template/ Path#CheckGlyph">
<Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePointerOver}" /> <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePointerOver}" />
</Style> </Style>
</Style> </Style>
<!-- Indeterminate Pressed State --> <!-- Indeterminate Pressed State -->
<Style Selector="^:pressed /template/"> <Style Selector="^:pressed">
<Style Selector="^ ContentPresenter#ContentPresenter"> <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePressed}" /> <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePressed}" />
</Style> </Style>
<Style Selector="^ Border#PART_Border"> <Style Selector="^ /template/ Border#PART_Border">
<Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePressed}" /> <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePressed}" />
<Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePressed}" /> <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePressed}" />
</Style> </Style>
<Style Selector="^ Border#NormalRectangle"> <Style Selector="^ /template/ Border#NormalRectangle">
<Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePressed}" /> <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePressed}" />
<Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePressed}" /> <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePressed}" />
</Style> </Style>
<Style Selector="^ Path#CheckGlyph"> <Style Selector="^ /template/ Path#CheckGlyph">
<Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePressed}" /> <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePressed}" />
</Style> </Style>
</Style> </Style>
<!-- Indeterminate Disabled State --> <!-- Indeterminate Disabled State -->
<Style Selector="^:disabled /template/"> <Style Selector="^:disabled">
<Style Selector="^ ContentPresenter#ContentPresenter"> <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminateDisabled}" /> <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminateDisabled}" />
</Style> </Style>
<Style Selector="^ Border#PART_Border"> <Style Selector="^ /template/ Border#PART_Border">
<Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminateDisabled}" /> <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminateDisabled}" />
<Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminateDisabled}" /> <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminateDisabled}" />
</Style> </Style>
<Style Selector="^ Border#NormalRectangle"> <Style Selector="^ /template/ Border#NormalRectangle">
<Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminateDisabled}" /> <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminateDisabled}" />
<Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminateDisabled}" /> <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminateDisabled}" />
</Style> </Style>
<Style Selector="^ Path#CheckGlyph"> <Style Selector="^ /template/ Path#CheckGlyph">
<Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminateDisabled}" /> <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminateDisabled}" />
</Style> </Style>
</Style> </Style>

50
src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
View File

@ -144,17 +144,15 @@
</Setter> </Setter>
<!-- Normal State --> <!-- Normal State -->
<Style Selector="^ /template/"> <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
<Style Selector="^ TextBlock#PlaceholderTextBlock"> <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForeground}" />
<Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForeground}" /> </Style>
</Style> <Style Selector="^ /template/ Border#HighlightBackground">
<Style Selector="^ Border#HighlightBackground"> <Setter Property="IsVisible" Value="False" />
<Setter Property="IsVisible" Value="False" /> </Style>
</Style> <Style Selector="^ /template/ PathIcon#DropDownGlyph">
<Style Selector="^ PathIcon#DropDownGlyph"> <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForeground}" />
<Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForeground}" /> <Setter Property="Data" Value="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
<Setter Property="Data" Value="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
</Style>
</Style> </Style>
<!-- PointerOver State --> <!-- PointerOver State -->
@ -175,51 +173,51 @@
</Style> </Style>
<!-- Focus Pressed State --> <!-- Focus Pressed State -->
<Style Selector="^:focused:pressed /template/"> <Style Selector="^:focused:pressed">
<Style Selector="^ ContentControl#ContentPresenter"> <Style Selector="^ /template/ ContentControl#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocusedPressed}" /> <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocusedPressed}" />
</Style> </Style>
<Style Selector="^ TextBlock#PlaceholderTextBlock"> <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundFocusedPressed}" /> <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundFocusedPressed}" />
</Style> </Style>
<Style Selector="^ PathIcon#DropDownGlyph"> <Style Selector="^ /template/ PathIcon#DropDownGlyph">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocusedPressed}" /> <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocusedPressed}" />
</Style> </Style>
</Style> </Style>
<!-- Focused State --> <!-- Focused State -->
<Style Selector="^:focus-visible /template/"> <Style Selector="^:focus-visible">
<Style Selector="^ Border#HighlightBackground"> <Style Selector="^ /template/ Border#HighlightBackground">
<Setter Property="IsVisible" Value="True" /> <Setter Property="IsVisible" Value="True" />
<Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBackgroundBorderBrushFocused}" /> <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBackgroundBorderBrushFocused}" />
</Style> </Style>
<Style Selector="^ ContentControl#ContentPresenter"> <Style Selector="^ /template/ ContentControl#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" /> <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
</Style> </Style>
<Style Selector="^ TextBlock#PlaceholderTextBlock"> <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" /> <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
</Style> </Style>
<Style Selector="^ PathIcon#DropDownGlyph"> <Style Selector="^ /template/ PathIcon#DropDownGlyph">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocused}" /> <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocused}" />
</Style> </Style>
</Style> </Style>
<!-- Disabled State --> <!-- Disabled State -->
<Style Selector="^:disabled /template/"> <Style Selector="^:disabled">
<Style Selector="^ Border#Background"> <Style Selector="^ /template/ Border#Background">
<Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundDisabled}" /> <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundDisabled}" />
<Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushDisabled}" /> <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushDisabled}" />
</Style> </Style>
<Style Selector="^ ContentPresenter#HeaderContentPresenter"> <Style Selector="^ /template/ ContentPresenter#HeaderContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" /> <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
</Style> </Style>
<Style Selector="^ ContentControl#ContentPresenter"> <Style Selector="^ /template/ ContentControl#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" /> <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
</Style> </Style>
<Style Selector="^ TextBlock#PlaceholderTextBlock"> <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" /> <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
</Style> </Style>
<Style Selector="^ PathIcon#DropDownGlyph"> <Style Selector="^ /template/ PathIcon#DropDownGlyph">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundDisabled}" /> <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundDisabled}" />
</Style> </Style>
</Style> </Style>

56
src/Avalonia.Themes.Fluent/Controls/Slider.xaml
View File

@ -283,17 +283,15 @@
<!-- Normal State --> <!-- Normal State -->
<Style Selector="^ /template/"> <Style Selector="^ /template/ Thumb.SliderThumbStyle">
<Style Selector="^Thumb.SliderThumbStyle"> <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
<Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" /> </Style>
</Style> <Style Selector="^ /template/ Grid#SliderContainer">
<Style Selector="^Grid#SliderContainer"> <Setter Property="Background" Value="{DynamicResource SliderContainerBackground}" />
<Setter Property="Background" Value="{DynamicResource SliderContainerBackground}" /> </Style>
</Style> <Style Selector="^/template/ TickBar">
<Style Selector="^TickBar"> <Setter Property="IsVisible" Value="False" />
<Setter Property="IsVisible" Value="False" /> <Setter Property="Fill" Value="{DynamicResource SliderTickBarFill}" />
<Setter Property="Fill" Value="{DynamicResource SliderTickBarFill}" />
</Style>
</Style> </Style>
<!-- TickBar Placement States --> <!-- TickBar Placement States -->
@ -316,70 +314,70 @@
<!-- Disabled State --> <!-- Disabled State -->
<Style Selector="^:disabled /template/"> <Style Selector="^:disabled">
<Style Selector="^ContentPresenter#HeaderContentPresenter"> <Style Selector="^ /template/ ContentPresenter#HeaderContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" /> <Setter Property="Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
</Style> </Style>
<Style Selector="^RepeatButton#PART_DecreaseButton"> <Style Selector="^ /template/ RepeatButton#PART_DecreaseButton">
<Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" /> <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" />
</Style> </Style>
<Style Selector="^RepeatButton#PART_IncreaseButton"> <Style Selector="^ /template/ RepeatButton#PART_IncreaseButton">
<Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" /> <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
</Style> </Style>
<Style Selector="^Thumb.SliderThumbStyle"> <Style Selector="^ /template/ Thumb.SliderThumbStyle">
<Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" /> <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
</Style> </Style>
<Style Selector="^TickBar"> <Style Selector="^ /template/ TickBar">
<Setter Property="Fill" Value="{DynamicResource SliderTickBarFillDisabled}" /> <Setter Property="Fill" Value="{DynamicResource SliderTickBarFillDisabled}" />
</Style> </Style>
</Style> </Style>
<!-- PointerOver State --> <!-- PointerOver State -->
<Style Selector="^:pointerover /template/"> <Style Selector="^:pointerover">
<Style Selector="^Grid#SliderContainer"> <Style Selector="^ /template/ Grid#SliderContainer">
<Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundDisabled}" /> <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
</Style> </Style>
<Style Selector="^RepeatButton#PART_IncreaseButton"> <Style Selector="^ /template/ RepeatButton#PART_IncreaseButton">
<Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" /> <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
</Style> </Style>
<Style Selector="^Thumb.SliderThumbStyle"> <Style Selector="^ /template/ Thumb.SliderThumbStyle">
<Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" /> <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
</Style> </Style>
<Style Selector="^Grid#SliderContainer"> <Style Selector="^ /template/ Grid#SliderContainer">
<Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPointerOver}" /> <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
</Style> </Style>
<Style Selector="^RepeatButton#PART_DecreaseButton"> <Style Selector="^ /template/ RepeatButton#PART_DecreaseButton">
<Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" /> <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
</Style> </Style>
</Style> </Style>
<!-- Pressed State --> <!-- Pressed State -->
<Style Selector="^:pressed /template/"> <Style Selector="^:pressed">
<Style Selector="^Grid#SliderContainer"> <Style Selector="^ /template/ Grid#SliderContainer">
<Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPressed}" /> <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPressed}" />
</Style> </Style>
<Style Selector="^RepeatButton#PART_DecreaseButton"> <Style Selector="^ /template/ RepeatButton#PART_DecreaseButton">
<Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPressed}" /> <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPressed}" />
</Style> </Style>
<Style Selector="^RepeatButton#PART_IncreaseButton"> <Style Selector="^ /template/ RepeatButton#PART_IncreaseButton">
<Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" /> <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
</Style> </Style>
<Style Selector="^Thumb.SliderThumbStyle"> <Style Selector="^ /template/ Thumb.SliderThumbStyle">
<Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" /> <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
</Style> </Style>
</Style> </Style>
<Style Selector="^:error"> <Style Selector="^:error">
<Setter Property="Foreground" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" /> <Setter Property="Foreground" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
<Style Selector="^/template/ Thumb.SliderThumbStyle"> <Style Selector="^ /template/ Thumb.SliderThumbStyle">
<Setter Property="Background" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" /> <Setter Property="Background" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
</Style> </Style>
</Style> </Style>

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

@ -82,11 +82,11 @@
<Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundDisabled}" /> <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundDisabled}" />
</Style> </Style>
</Style>--> </Style>-->
<Style Selector="^:disabled /template/"> <Style Selector="^:disabled">
<Style Selector="^ ContentPresenter#HeaderContentPresenter"> <Style Selector="^ /template/ ContentPresenter#HeaderContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource TimePickerHeaderForegroundDisabled}" /> <Setter Property="Foreground" Value="{DynamicResource TimePickerHeaderForegroundDisabled}" />
</Style> </Style>
<Style Selector="^ Rectangle"> <Style Selector="^ /template/ Rectangle">
<Setter Property="Fill" Value="{DynamicResource TimePickerSpacerFillDisabled}" /> <Setter Property="Fill" Value="{DynamicResource TimePickerSpacerFillDisabled}" />
</Style> </Style>
</Style> </Style>

Write Preview
Loading…
Cancel
Save