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

Fixed broken accessibility properties in ScrollBar control (#20483) 

* Fixed broken accessibility properties in ScrollBar control

* Prefer setting Thumb name in xaml instead

* Fixed broken accessibility propertes in ScrollBar control on Simple theme
pull/20505/head
Melissa 3 weeks ago
committed by GitHub
parent
ff0a61486d
commit
80be90dcea
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
2 changed files with 40 additions and 20 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. 30
      src/Avalonia.Themes.Fluent/Controls/ScrollBar.xaml
  2. 30
      src/Avalonia.Themes.Simple/Controls/ScrollBar.xaml

30
src/Avalonia.Themes.Fluent/Controls/ScrollBar.xaml
View File

@ -137,7 +137,8 @@
Grid.Row="0" Grid.Row="0"
Focusable="False" Focusable="False"
MinWidth="{DynamicResource ScrollBarSize}" MinWidth="{DynamicResource ScrollBarSize}"
Height="{DynamicResource ScrollBarSize}"> Height="{DynamicResource ScrollBarSize}"
AutomationProperties.Name="Line up">
<PathIcon Data="M 19.091797 14.970703 L 10 5.888672 L 0.908203 14.970703 L 0.029297 14.091797 L 10 4.111328 L 19.970703 14.091797 Z" <PathIcon Data="M 19.091797 14.970703 L 10 5.888672 L 0.908203 14.970703 L 0.029297 14.091797 L 10 4.111328 L 19.970703 14.091797 Z"
Width="{DynamicResource ScrollBarButtonArrowIconFontSize}" Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
Height="{DynamicResource ScrollBarButtonArrowIconFontSize}"/> Height="{DynamicResource ScrollBarButtonArrowIconFontSize}"/>
@ -155,19 +156,22 @@
<RepeatButton Name="PART_PageUpButton" <RepeatButton Name="PART_PageUpButton"
Classes="largeIncrease" Classes="largeIncrease"
Theme="{StaticResource FluentScrollBarPageButton}" Theme="{StaticResource FluentScrollBarPageButton}"
Focusable="False" /> Focusable="False"
AutomationProperties.Name="Page up"/>
</Track.DecreaseButton> </Track.DecreaseButton>
<Track.IncreaseButton> <Track.IncreaseButton>
<RepeatButton Name="PART_PageDownButton" <RepeatButton Name="PART_PageDownButton"
Classes="largeIncrease" Classes="largeIncrease"
Theme="{StaticResource FluentScrollBarPageButton}" Theme="{StaticResource FluentScrollBarPageButton}"
Focusable="False" /> Focusable="False"
AutomationProperties.Name="Page down"/>
</Track.IncreaseButton> </Track.IncreaseButton>
<Thumb Theme="{StaticResource FluentScrollBarThumb}" <Thumb Theme="{StaticResource FluentScrollBarThumb}"
Width="{DynamicResource ScrollBarSize}" Width="{DynamicResource ScrollBarSize}"
MinHeight="{DynamicResource ScrollBarSize}" MinHeight="{DynamicResource ScrollBarSize}"
RenderTransform="{DynamicResource VerticalSmallScrollThumbScaleTransform}" RenderTransform="{DynamicResource VerticalSmallScrollThumbScaleTransform}"
RenderTransformOrigin="100%,50%" /> RenderTransformOrigin="100%,50%"
AutomationProperties.Name="Position"/>
</Track> </Track>
<RepeatButton Name="PART_LineDownButton" <RepeatButton Name="PART_LineDownButton"
@ -176,7 +180,8 @@
Grid.Row="2" Grid.Row="2"
Focusable="False" Focusable="False"
MinWidth="{DynamicResource ScrollBarSize}" MinWidth="{DynamicResource ScrollBarSize}"
Height="{DynamicResource ScrollBarSize}"> Height="{DynamicResource ScrollBarSize}"
AutomationProperties.Name="Line down">
<PathIcon Data="M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z" <PathIcon Data="M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z"
Width="{DynamicResource ScrollBarButtonArrowIconFontSize}" Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
Height="{DynamicResource ScrollBarButtonArrowIconFontSize}"/> Height="{DynamicResource ScrollBarButtonArrowIconFontSize}"/>
@ -215,7 +220,8 @@
Grid.Column="0" Grid.Column="0"
Focusable="False" Focusable="False"
MinHeight="{DynamicResource ScrollBarSize}" MinHeight="{DynamicResource ScrollBarSize}"
Width="{DynamicResource ScrollBarSize}"> Width="{DynamicResource ScrollBarSize}"
AutomationProperties.Name="Column left">
<PathIcon Data="M 14.091797 19.970703 L 4.111328 10 L 14.091797 0.029297 L 14.970703 0.908203 L 5.888672 10 L 14.970703 19.091797 Z" <PathIcon Data="M 14.091797 19.970703 L 4.111328 10 L 14.091797 0.029297 L 14.970703 0.908203 L 5.888672 10 L 14.970703 19.091797 Z"
Width="{DynamicResource ScrollBarButtonArrowIconFontSize}" Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
Height="{DynamicResource ScrollBarButtonArrowIconFontSize}"/> Height="{DynamicResource ScrollBarButtonArrowIconFontSize}"/>
@ -232,19 +238,22 @@
<RepeatButton Name="PART_PageUpButton" <RepeatButton Name="PART_PageUpButton"
Classes="largeIncrease" Classes="largeIncrease"
Theme="{StaticResource FluentScrollBarPageButton}" Theme="{StaticResource FluentScrollBarPageButton}"
Focusable="False" /> Focusable="False"
AutomationProperties.Name="Page left"/>
</Track.DecreaseButton> </Track.DecreaseButton>
<Track.IncreaseButton> <Track.IncreaseButton>
<RepeatButton Name="PART_PageDownButton" <RepeatButton Name="PART_PageDownButton"
Classes="largeIncrease" Classes="largeIncrease"
Theme="{StaticResource FluentScrollBarPageButton}" Theme="{StaticResource FluentScrollBarPageButton}"
Focusable="False" /> Focusable="False"
AutomationProperties.Name="Page right"/>
</Track.IncreaseButton> </Track.IncreaseButton>
<Thumb Theme="{StaticResource FluentScrollBarThumb}" <Thumb Theme="{StaticResource FluentScrollBarThumb}"
Height="{DynamicResource ScrollBarSize}" Height="{DynamicResource ScrollBarSize}"
MinWidth="{DynamicResource ScrollBarSize}" MinWidth="{DynamicResource ScrollBarSize}"
RenderTransform="{DynamicResource HorizontalSmallScrollThumbScaleTransform}" RenderTransform="{DynamicResource HorizontalSmallScrollThumbScaleTransform}"
RenderTransformOrigin="50%,100%" /> RenderTransformOrigin="50%,100%"
AutomationProperties.Name="Position"/>
</Track> </Track>
<RepeatButton Name="PART_LineDownButton" <RepeatButton Name="PART_LineDownButton"
@ -253,7 +262,8 @@
Grid.Column="2" Grid.Column="2"
Focusable="False" Focusable="False"
MinHeight="{DynamicResource ScrollBarSize}" MinHeight="{DynamicResource ScrollBarSize}"
Width="{DynamicResource ScrollBarSize}"> Width="{DynamicResource ScrollBarSize}"
AutomationProperties.Name="Column right">
<PathIcon Data="M 5.029297 19.091797 L 14.111328 10 L 5.029297 0.908203 L 5.908203 0.029297 L 15.888672 10 L 5.908203 19.970703 Z" <PathIcon Data="M 5.029297 19.091797 L 14.111328 10 L 5.029297 0.908203 L 5.908203 0.029297 L 15.888672 10 L 5.908203 19.970703 Z"
Width="{DynamicResource ScrollBarButtonArrowIconFontSize}" Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
Height="{DynamicResource ScrollBarButtonArrowIconFontSize}"/> Height="{DynamicResource ScrollBarButtonArrowIconFontSize}"/>

30
src/Avalonia.Themes.Simple/Controls/ScrollBar.xaml
View File

@ -18,7 +18,8 @@
MinWidth="{DynamicResource ScrollBarThickness}" MinWidth="{DynamicResource ScrollBarThickness}"
VerticalAlignment="Center" VerticalAlignment="Center"
Classes="repeat" Classes="repeat"
Focusable="False"> Focusable="False"
AutomationProperties.Name="Column left">
<Path Data="M 4 0 L 4 8 L 0 4 Z" /> <Path Data="M 4 0 L 4 8 L 0 4 Z" />
</RepeatButton> </RepeatButton>
<Track Grid.Row="1" <Track Grid.Row="1"
@ -33,14 +34,17 @@
<Track.DecreaseButton> <Track.DecreaseButton>
<RepeatButton Name="PART_PageUpButton" <RepeatButton Name="PART_PageUpButton"
Classes="repeattrack" Classes="repeattrack"
Focusable="False" /> Focusable="False"
AutomationProperties.Name="Page left"/>
</Track.DecreaseButton> </Track.DecreaseButton>
<Track.IncreaseButton> <Track.IncreaseButton>
<RepeatButton Name="PART_PageDownButton" <RepeatButton Name="PART_PageDownButton"
Classes="repeattrack" Classes="repeattrack"
Focusable="False" /> Focusable="False"
AutomationProperties.Name="Page right"/>
</Track.IncreaseButton> </Track.IncreaseButton>
<Thumb Name="thumb" /> <Thumb Name="thumb"
AutomationProperties.Name="Position"/>
</Track> </Track>
<RepeatButton Name="PART_LineDownButton" <RepeatButton Name="PART_LineDownButton"
Grid.Row="2" Grid.Row="2"
@ -48,7 +52,8 @@
MinWidth="{DynamicResource ScrollBarThickness}" MinWidth="{DynamicResource ScrollBarThickness}"
VerticalAlignment="Center" VerticalAlignment="Center"
Classes="repeat" Classes="repeat"
Focusable="False"> Focusable="False"
AutomationProperties.Name="Column right">
<Path Data="M 0 0 L 4 4 L 0 8 Z" /> <Path Data="M 0 0 L 4 4 L 0 8 Z" />
</RepeatButton> </RepeatButton>
</Grid> </Grid>
@ -68,7 +73,8 @@
MinHeight="{DynamicResource ScrollBarThickness}" MinHeight="{DynamicResource ScrollBarThickness}"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Classes="repeat" Classes="repeat"
Focusable="False"> Focusable="False"
AutomationProperties.Name="Line up">
<Path Data="M 0 4 L 8 4 L 4 0 Z" /> <Path Data="M 0 4 L 8 4 L 4 0 Z" />
</RepeatButton> </RepeatButton>
<Track Grid.Row="1" <Track Grid.Row="1"
@ -84,14 +90,17 @@
<Track.DecreaseButton> <Track.DecreaseButton>
<RepeatButton Name="PART_PageUpButton" <RepeatButton Name="PART_PageUpButton"
Classes="repeattrack" Classes="repeattrack"
Focusable="False" /> Focusable="False"
AutomationProperties.Name="Page up"/>
</Track.DecreaseButton> </Track.DecreaseButton>
<Track.IncreaseButton> <Track.IncreaseButton>
<RepeatButton Name="PART_PageDownButton" <RepeatButton Name="PART_PageDownButton"
Classes="repeattrack" Classes="repeattrack"
Focusable="False" /> Focusable="False"
AutomationProperties.Name="Page down"/>
</Track.IncreaseButton> </Track.IncreaseButton>
<Thumb Name="thumb" /> <Thumb Name="thumb"
AutomationProperties.Name="Position"/>
</Track> </Track>
<RepeatButton Name="PART_LineDownButton" <RepeatButton Name="PART_LineDownButton"
Grid.Row="2" Grid.Row="2"
@ -99,7 +108,8 @@
MinHeight="{DynamicResource ScrollBarThickness}" MinHeight="{DynamicResource ScrollBarThickness}"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Classes="repeat" Classes="repeat"
Focusable="False"> Focusable="False"
AutomationProperties.Name="Line down">
<Path Data="M 0 0 L 4 4 L 8 0 Z" /> <Path Data="M 0 0 L 4 4 L 8 0 Z" />
</RepeatButton> </RepeatButton>
</Grid> </Grid>

Write Preview
Loading…
Cancel
Save