Skip to content

fix: #1341: MenuItem template binding error #1343

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
pomianowski merged 3 commits into from
Feb 16, 2025
Merged

fix: #1341: MenuItem template binding error #1343

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5994df0
fix: #1341
JohnTasler Feb 9, 2025
b3ae87f
fix: set `StaysOpenOnClick` on screen-reader `TextBlock`
JohnTasler Feb 11, 2025
5e890fa
fix: Remove unnecessary TextBlock from MenuItem template
JohnTasler Feb 16, 2025
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
42 changes: 0 additions & 42 deletions src/Wpf.Ui/Controls/Menu/MenuItem.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,6 @@
ContentSource="Header"
RecognizesAccessKey="True"
TextElement.Foreground="{TemplateBinding Foreground}" />
<!-- TextBlock added so that screen readers don't try to read Icon -->
<TextBlock Grid.Column="0"
Grid.ColumnSpan="3"
Width="{Binding Width, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
Height="{Binding Height, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
Margin="-10"
FontSize="1"
Opacity="0"
Text="{Binding AutomationProperties.Name, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
Background="Black"/>
</Grid>

<Popup
Expand Down Expand Up @@ -191,16 +181,6 @@
ContentSource="Header"
RecognizesAccessKey="True"
TextElement.Foreground="{TemplateBinding Foreground}" />
<!-- TextBlock added so that screen readers don't try to read Icon -->
<TextBlock Grid.Column="0"
Grid.ColumnSpan="3"
Width="{Binding Width, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
Height="{Binding Height, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
Margin="-10"
FontSize="1"
Opacity="0"
Text="{Binding AutomationProperties.Name, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
Background="Black"/>
</Grid>
</Border>
<ControlTemplate.Triggers>
Expand Down Expand Up @@ -284,17 +264,6 @@
FontSize="11"
Foreground="{DynamicResource TextFillColorDisabledBrush}"
Text="{TemplateBinding InputGestureText}" />

<!-- TextBlock added so that screen readers don't try to read Icon -->
<TextBlock Grid.Column="0"
Grid.ColumnSpan="5"
Width="{Binding Width, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
Height="{Binding Height, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
Margin="-10"
FontSize="1"
Opacity="0"
Text="{Binding AutomationProperties.Name, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
Background="Black"/>
</Grid>
</Border>
<ControlTemplate.Triggers>
Expand Down Expand Up @@ -365,17 +334,6 @@
FontSize="{TemplateBinding FontSize}"
Symbol="ChevronRight20" />
</Grid>

<!-- Fix double narration from mousing over the button and then the associated text -->
<TextBlock Grid.Column="0"
Grid.ColumnSpan="3"
Width="{Binding Width, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
Height="{Binding Height, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
Margin="-10"
FontSize="1"
Opacity="0"
Text="{Binding AutomationProperties.Name, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
Background="Black"/>
</Grid>
</Border>

Expand Down