Skip to content

Add keyboard focus visual indicator for slider v2 #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SKProCH merged 1 commit into from
Oct 28, 2025
Merged

Add keyboard focus visual indicator for slider v2 #486

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 28 additions & 15 deletions Material.Styles/Resources/Themes/Slider.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
</ControlTemplate>
</Setter>

<Style Selector="^:focus-visible /template/ Border#PART_HoverEffect">
<Setter Property="Opacity" Value="0.20" />
</Style>

<Style Selector="^ /template/ Panel#PART_RootPanel">
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" />
Expand Down Expand Up @@ -120,14 +124,14 @@
Name="PART_Positioner">
<Border Name="PART_ContentContainer">
<!-- TODO: Fix positioner
Seems like TransformedBounds property is gone, we need something else that
can be refreshed at every frame and contains component position data -->
Seems like TransformedBounds property is gone, we need something else that
can be refreshed at every frame and contains component position data -->
<!--
<Border.RenderTransform>
<MultiBinding Converter="{StaticResource AutoCorrectPositionConverter}">
<Binding ElementName="PART_Positioner" Path="TransformedBounds" />
<Binding Path="$parent[TopLevel].Bounds" />
</MultiBinding>
<MultiBinding Converter="{StaticResource AutoCorrectPositionConverter}">
<Binding ElementName="PART_Positioner" Path="TransformedBounds" />
<Binding Path="$parent[TopLevel].Bounds" />
</MultiBinding>
</Border.RenderTransform>-->

<ContentPresenter Name="PART_ContentPresenter" />
Expand Down Expand Up @@ -292,6 +296,7 @@
<ControlTheme x:Key="MaterialSlider" TargetType="Slider">
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="Focusable" Value="False"/>
<Setter Property="Foreground" Value="{DynamicResource MaterialPrimaryMidBrush}" />
<Setter Property="ClipToBounds" Value="False" />
<Setter Property="Template">
Expand All @@ -302,8 +307,8 @@
BorderThickness="{TemplateBinding BorderThickness}">
<Panel Name="PART_RootPanel">
<!-- I have no idea how to reorder tick bar in between track and thumb
The tricky way might works by using ProgressBar as track (only visual, no hit test)
and then make transparent the track (the interactable one). -->
The tricky way might works by using ProgressBar as track (only visual, no hit test)
and then make transparent the track (the interactable one). -->
<ProgressBar Name="PART_ProgressLayer"
Minimum="{TemplateBinding Minimum}"
Maximum="{TemplateBinding Maximum}"
Expand All @@ -324,13 +329,16 @@
Minimum="{TemplateBinding Minimum}"
Value="{TemplateBinding Value}">
<Track.DecreaseButton>
<RepeatButton Name="PART_DecreaseButton" Theme="{StaticResource MaterialEmptyRepeatButton}" />
<RepeatButton Name="PART_DecreaseButton" Theme="{StaticResource MaterialEmptyRepeatButton}"
Focusable="False"/>
</Track.DecreaseButton>
<Track.IncreaseButton>
<RepeatButton Name="PART_IncreaseButton" Theme="{StaticResource MaterialEmptyRepeatButton}" />
<RepeatButton Name="PART_IncreaseButton" Theme="{StaticResource MaterialEmptyRepeatButton}"
Focusable="False"/>
</Track.IncreaseButton>
<Track.Thumb>
<Thumb Name="PART_SliderThumb" />
<Thumb Name="PART_SliderThumb"
Focusable="True"/>
</Track.Thumb>
</Track>
</Panel>
Expand Down Expand Up @@ -420,7 +428,7 @@
<Setter Property="ActiveBrush" Value="{DynamicResource MaterialCardBackgroundBrush}" />
</Style>
</ControlTheme>

<ControlTheme x:Key="{x:Type Slider}" TargetType="Slider"
BasedOn="{StaticResource MaterialSlider}" />

Expand Down Expand Up @@ -471,6 +479,10 @@
</Setter>
</Style>

<Style Selector="^:focus /template/ Ellipse#PART_HoverEffect">
<Setter Property="Opacity" Value="0.20" />
</Style>

<Style Selector="^:pointerover /template/ Ellipse#PART_HoverEffect">
<Setter Property="Opacity" Value="0.24" />
</Style>
Expand Down Expand Up @@ -507,6 +519,7 @@
<!-- Legacy slider theme (material v1, refer link: https://material.io/archive/guidelines/components/sliders.html) -->
<ControlTheme x:Key="MaterialSliderV1"
TargetType="Slider">
<Setter Property="Focusable" Value="False"/>
<Setter Property="Template">
<ControlTemplate>
<Border Name="PART_RootBorder"
Expand All @@ -521,13 +534,13 @@
Maximum="{TemplateBinding Maximum}"
Value="{TemplateBinding Value}">
<Track.DecreaseButton>
<RepeatButton Name="PART_DecreaseButton" Theme="{StaticResource MaterialEmptyRepeatButton}" />
<RepeatButton Name="PART_DecreaseButton" Theme="{StaticResource MaterialEmptyRepeatButton}"/>
</Track.DecreaseButton>
<Track.IncreaseButton>
<RepeatButton Name="PART_IncreaseButton" Theme="{StaticResource MaterialEmptyRepeatButton}" />
<RepeatButton Name="PART_IncreaseButton" Theme="{StaticResource MaterialEmptyRepeatButton}"/>
</Track.IncreaseButton>
<Track.Thumb>
<Thumb Name="PART_SliderThumb" />
<Thumb Name="PART_SliderThumb"/>
</Track.Thumb>
</Track>
</Panel>
Expand Down