|
74 | 74 | ContentSource="Header"
|
75 | 75 | RecognizesAccessKey="True"
|
76 | 76 | TextElement.Foreground="{TemplateBinding Foreground}" />
|
77 |
| - <!-- TextBlock added so that screen readers don't try to read Icon --> |
78 |
| - <TextBlock Grid.Column="0" |
79 |
| - Grid.ColumnSpan="3" |
80 |
| - Width="{Binding Width, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}" |
81 |
| - Height="{Binding Height, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}" |
82 |
| - Margin="-10" |
83 |
| - FontSize="1" |
84 |
| - Opacity="0" |
85 |
| - Text="{Binding AutomationProperties.Name, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}" |
86 |
| - Background="Black"/> |
87 | 77 | </Grid>
|
88 | 78 |
|
89 | 79 | <Popup
|
|
191 | 181 | ContentSource="Header"
|
192 | 182 | RecognizesAccessKey="True"
|
193 | 183 | TextElement.Foreground="{TemplateBinding Foreground}" />
|
194 |
| - <!-- TextBlock added so that screen readers don't try to read Icon --> |
195 |
| - <TextBlock Grid.Column="0" |
196 |
| - Grid.ColumnSpan="3" |
197 |
| - Width="{Binding Width, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}" |
198 |
| - Height="{Binding Height, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}" |
199 |
| - Margin="-10" |
200 |
| - FontSize="1" |
201 |
| - Opacity="0" |
202 |
| - Text="{Binding AutomationProperties.Name, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}" |
203 |
| - Background="Black"/> |
204 | 184 | </Grid>
|
205 | 185 | </Border>
|
206 | 186 | <ControlTemplate.Triggers>
|
|
284 | 264 | FontSize="11"
|
285 | 265 | Foreground="{DynamicResource TextFillColorDisabledBrush}"
|
286 | 266 | Text="{TemplateBinding InputGestureText}" />
|
287 |
| - |
288 |
| - <!-- TextBlock added so that screen readers don't try to read Icon --> |
289 |
| - <TextBlock Grid.Column="0" |
290 |
| - Grid.ColumnSpan="5" |
291 |
| - Width="{Binding Width, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}" |
292 |
| - Height="{Binding Height, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}" |
293 |
| - Margin="-10" |
294 |
| - FontSize="1" |
295 |
| - Opacity="0" |
296 |
| - Text="{Binding AutomationProperties.Name, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}" |
297 |
| - Background="Black"/> |
298 | 267 | </Grid>
|
299 | 268 | </Border>
|
300 | 269 | <ControlTemplate.Triggers>
|
|
365 | 334 | FontSize="{TemplateBinding FontSize}"
|
366 | 335 | Symbol="ChevronRight20" />
|
367 | 336 | </Grid>
|
368 |
| - |
369 |
| - <!-- Fix double narration from mousing over the button and then the associated text --> |
370 |
| - <TextBlock Grid.Column="0" |
371 |
| - Grid.ColumnSpan="3" |
372 |
| - Width="{Binding Width, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}" |
373 |
| - Height="{Binding Height, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}" |
374 |
| - Margin="-10" |
375 |
| - FontSize="1" |
376 |
| - Opacity="0" |
377 |
| - Text="{Binding AutomationProperties.Name, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}" |
378 |
| - Background="Black"/> |
379 | 337 | </Grid>
|
380 | 338 | </Border>
|
381 | 339 |
|
|
0 commit comments