fix: Remove unnecessary TextBlock from MenuItem template

lepoco · Feb 16, 2025 · 5e890fa · 5e890fa
1 parent b3ae87f
commit 5e890fa
Showing 1 changed file with 0 additions and 50 deletions.
diff --git a/src/Wpf.Ui/Controls/Menu/MenuItem.xaml b/src/Wpf.Ui/Controls/Menu/MenuItem.xaml
@@ -74,18 +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="{TemplateBinding Width}"
-                        Height="{TemplateBinding Height}"
-                        Margin="-10"
-                        Background="Black"
-                        FontSize="1"
-                        IsHitTestVisible="False"
-                        Opacity="0"
-                        Text="{TemplateBinding AutomationProperties.Name}" />
                 </Grid>
 
                 <Popup
@@ -193,18 +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="2"
-                    Width="{TemplateBinding Width}"
-                    Height="{TemplateBinding Height}"
-                    Margin="-10"
-                    Background="Black"
-                    FontSize="1"
-                    IsHitTestVisible="False"
-                    Opacity="0"
-                    Text="{TemplateBinding AutomationProperties.Name}" />
             </Grid>
         </Border>
         <ControlTemplate.Triggers>
@@ -288,19 +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="4"
-                    Width="{TemplateBinding Width}"
-                    Height="{TemplateBinding Height}"
-                    Margin="-10"
-                    Background="Black"
-                    FontSize="1"
-                    IsHitTestVisible="False"
-                    Opacity="0"
-                    Text="{TemplateBinding AutomationProperties.Name}" />
             </Grid>
         </Border>
         <ControlTemplate.Triggers>
@@ -371,19 +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="{TemplateBinding Width}"
-                        Height="{TemplateBinding Height}"
-                        Margin="-10"
-                        Background="Black"
-                        FontSize="1"
-                        IsHitTestVisible="False"
-                        Opacity="0"
-                        Text="{TemplateBinding AutomationProperties.Name}" />
                 </Grid>
             </Border>