diff --git a/src/Avalonia.Themes.Fluent2/Controls/Slider.xaml b/src/Avalonia.Themes.Fluent2/Controls/Slider.xaml index 8163e39a60..1749cf086c 100644 --- a/src/Avalonia.Themes.Fluent2/Controls/Slider.xaml +++ b/src/Avalonia.Themes.Fluent2/Controls/Slider.xaml @@ -35,11 +35,11 @@ + Track is 4px tall with 2px rounded ends (NOTE: track thickness comes from the shared + SliderTrackThemeHeight key, which is still 2 in FluentControlResources.xaml and must be + updated to 4 there). The thumb is a 22px ControlSolidFillColorDefault circle with a 1px + CircleElevationBorderBrush ring containing an accent inner ellipse that is 12px at rest, + grows to 14px on thumb hover and shrinks to 10px while pressed/dragged (167ms). --> 0,0,0,4 14 14 @@ -84,32 +84,28 @@ - - + + Background="{DynamicResource SliderOuterThumbBackground}" + BorderBrush="{DynamicResource SliderThumbBorderBrush}" + BorderThickness="{TemplateBinding BorderThickness}" + CornerRadius="{DynamicResource SliderThumbCornerRadius}"> - - + @@ -117,15 +113,12 @@ - - @@ -133,97 +126,98 @@ + - - - - - - - - - - - - - - - - - - - + BorderBrush="{TemplateBinding BorderBrush}" + BorderThickness="{TemplateBinding BorderThickness}" + CornerRadius="{TemplateBinding CornerRadius}"> + + + + + + + + + + + + + + + + + + + + + + @@ -234,94 +228,94 @@ - - - - - - - - - - - - - - - - - - - - - - + BorderBrush="{TemplateBinding BorderBrush}" + BorderThickness="{TemplateBinding BorderThickness}" + CornerRadius="{TemplateBinding CornerRadius}"> + + + + + + + + + + + + + + + + + + + + + +