Skip to content

Fixing Accessibility Issue in Expander- Narrator announcing expander state as on / off #9255

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
merged 2 commits into from
Jun 17, 2024
Merged

Fixing Accessibility Issue in Expander- Narrator announcing expander state as on / off #9255

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf545f0
1. Changed the name of Toggle Button in expander to fix the narrator …
himgoyalmicro Jun 15, 2024
523b9fa
Merge branch 'dotnet:main' into user/himgoyal/expanderNarratorIssue
himgoyalmicro Jun 17, 2024
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
17 changes: 9 additions & 8 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/Expander.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,8 @@
BorderThickness="1"
CornerRadius="{TemplateBinding Border.CornerRadius}">
<ToggleButton
x:Name="ExpanderToggleButton"
x:Name="HeaderSite"
AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}"
Margin="0"
Padding="{TemplateBinding Padding}"
HorizontalAlignment="Stretch"
Expand Down Expand Up @@ -550,7 +551,7 @@
TargetName="ToggleButtonBorder"/>
<Setter Property="Template"
Value="{StaticResource DefaultExpanderToggleButtonRightStyle}"
TargetName="ExpanderToggleButton"/>
TargetName="HeaderSite"/>
<Setter Property="RenderTransform"
Value="{DynamicResource WidthAnimation}"
TargetName="ContentPresenterBorder" />
Expand All @@ -566,7 +567,7 @@
TargetName="ToggleButtonBorder"/>
<Setter Property="Template"
Value="{StaticResource DefaultExpanderToggleButtonUpStyle}"
TargetName="ExpanderToggleButton"/>
TargetName="HeaderSite"/>
<Setter Property="RenderTransform"
Value="{DynamicResource HeightAnimation}"
TargetName="ContentPresenterBorder" />
Expand All @@ -589,7 +590,7 @@
TargetName="ToggleButtonBorder"/>
<Setter Property="Template"
Value="{StaticResource DefaultExpanderToggleButtonLeftStyle}"
TargetName="ExpanderToggleButton"/>
TargetName="HeaderSite"/>
<Setter Property="RenderTransform"
Value="{DynamicResource WidthAnimation}"
TargetName="ContentPresenterBorder" />
Expand All @@ -598,12 +599,12 @@
<Trigger Property="IsEnabled"
Value="False">
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}" />
<Setter TargetName="ExpanderToggleButton" Property="Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}" />
<Setter TargetName="ExpanderToggleButton" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderDisabledBorderBrush}" />
<Setter TargetName="HeaderSite" Property="Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}" />
<Setter TargetName="HeaderSite" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderDisabledBorderBrush}" />
</Trigger>

<Trigger SourceName="ExpanderToggleButton" Property="IsMouseOver" Value="True">
<Setter TargetName="ExpanderToggleButton" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderPointerOverBrush}" />
<Trigger SourceName="HeaderSite" Property="IsMouseOver" Value="True">
<Setter TargetName="HeaderSite" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderPointerOverBrush}" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
Expand Down