|
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" |
| 77 | + <!-- TextBlock added so that screen readers don't try to read Icon --> |
| 78 | + <TextBlock |
| 79 | + Grid.Column="0" |
79 | 80 | Grid.ColumnSpan="3"
|
80 | 81 | Width="{TemplateBinding Width}"
|
81 | 82 | Height="{TemplateBinding Height}"
|
82 | 83 | Margin="-10"
|
| 84 | + Background="Black" |
83 | 85 | FontSize="1"
|
| 86 | + IsHitTestVisible="False" |
84 | 87 | Opacity="0"
|
85 |
| - Text="{TemplateBinding AutomationProperties.Name}" |
86 |
| - Background="Black"/> |
| 88 | + Text="{TemplateBinding AutomationProperties.Name}" /> |
87 | 89 | </Grid>
|
88 | 90 |
|
89 | 91 | <Popup
|
|
191 | 193 | ContentSource="Header"
|
192 | 194 | RecognizesAccessKey="True"
|
193 | 195 | 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="{TemplateBinding Width}" |
198 |
| - Height="{TemplateBinding Height}" |
199 |
| - Margin="-10" |
200 |
| - FontSize="1" |
201 |
| - Opacity="0" |
202 |
| - Text="{TemplateBinding AutomationProperties.Name}" |
203 |
| - Background="Black"/> |
| 196 | + <!-- TextBlock added so that screen readers don't try to read Icon --> |
| 197 | + <TextBlock |
| 198 | + Grid.Column="0" |
| 199 | + Grid.ColumnSpan="2" |
| 200 | + Width="{TemplateBinding Width}" |
| 201 | + Height="{TemplateBinding Height}" |
| 202 | + Margin="-10" |
| 203 | + Background="Black" |
| 204 | + FontSize="1" |
| 205 | + IsHitTestVisible="False" |
| 206 | + Opacity="0" |
| 207 | + Text="{TemplateBinding AutomationProperties.Name}" /> |
204 | 208 | </Grid>
|
205 | 209 | </Border>
|
206 | 210 | <ControlTemplate.Triggers>
|
|
284 | 288 | FontSize="11"
|
285 | 289 | Foreground="{DynamicResource TextFillColorDisabledBrush}"
|
286 | 290 | 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="{TemplateBinding Width}" |
292 |
| - Height="{TemplateBinding Height}" |
293 |
| - Margin="-10" |
294 |
| - FontSize="1" |
295 |
| - Opacity="0" |
296 |
| - Text="{TemplateBinding AutomationProperties.Name}" |
297 |
| - Background="Black"/> |
| 291 | + |
| 292 | + <!-- TextBlock added so that screen readers don't try to read Icon --> |
| 293 | + <TextBlock |
| 294 | + Grid.Column="0" |
| 295 | + Grid.ColumnSpan="4" |
| 296 | + Width="{TemplateBinding Width}" |
| 297 | + Height="{TemplateBinding Height}" |
| 298 | + Margin="-10" |
| 299 | + Background="Black" |
| 300 | + FontSize="1" |
| 301 | + IsHitTestVisible="False" |
| 302 | + Opacity="0" |
| 303 | + Text="{TemplateBinding AutomationProperties.Name}" /> |
298 | 304 | </Grid>
|
299 | 305 | </Border>
|
300 | 306 | <ControlTemplate.Triggers>
|
|
365 | 371 | FontSize="{TemplateBinding FontSize}"
|
366 | 372 | Symbol="ChevronRight20" />
|
367 | 373 | </Grid>
|
368 |
| - |
369 |
| - <!-- Fix double narration from mousing over the button and then the associated text --> |
370 |
| - <TextBlock Grid.Column="0" |
| 374 | + |
| 375 | + <!-- Fix double narration from mousing over the button and then the associated text --> |
| 376 | + <TextBlock |
| 377 | + Grid.Column="0" |
371 | 378 | Grid.ColumnSpan="3"
|
372 | 379 | Width="{TemplateBinding Width}"
|
373 | 380 | Height="{TemplateBinding Height}"
|
374 | 381 | Margin="-10"
|
| 382 | + Background="Black" |
375 | 383 | FontSize="1"
|
| 384 | + IsHitTestVisible="False" |
376 | 385 | Opacity="0"
|
377 |
| - Text="{TemplateBinding AutomationProperties.Name}" |
378 |
| - Background="Black"/> |
| 386 | + Text="{TemplateBinding AutomationProperties.Name}" /> |
379 | 387 | </Grid>
|
380 | 388 | </Border>
|
381 | 389 |
|
|
0 commit comments