|
311 | 311 | <Setter.Value> |
312 | 312 | <ControlTemplate TargetType="{x:Type CalendarItem}"> |
313 | 313 | <Grid x:Name="PART_Root" Margin="12"> |
314 | | - <Grid> |
| 314 | + <Grid KeyboardNavigation.TabNavigation="Cycle"> |
315 | 315 | <Grid.RowDefinitions> |
316 | 316 | <RowDefinition Height="Auto" /> |
317 | 317 | <RowDefinition Height="*" /> |
|
333 | 333 | VerticalAlignment="Center" |
334 | 334 | Background="Transparent" |
335 | 335 | BorderBrush="Transparent" |
336 | | - Focusable="False" |
| 336 | + Focusable="True" |
337 | 337 | FontSize="14" |
338 | 338 | FontWeight="Bold" |
| 339 | + KeyboardNavigation.TabNavigation="Cycle" |
339 | 340 | Foreground="{DynamicResource CalendarViewForeground}" /> |
340 | 341 | <Button |
341 | 342 | x:Name="PART_PreviousButton" |
342 | | - Grid.Column="1" |
| 343 | + Grid.Column="1" |
343 | 344 | Width="26" |
344 | 345 | Height="26" |
345 | 346 | Margin="0,0,8,0" |
|
348 | 349 | VerticalAlignment="Center" |
349 | 350 | Background="Transparent" |
350 | 351 | BorderBrush="Transparent" |
351 | | - Focusable="False" |
| 352 | + Focusable="True" |
352 | 353 | AutomationProperties.Name="Previous" |
| 354 | + KeyboardNavigation.TabNavigation="Cycle" |
353 | 355 | Foreground="{DynamicResource CalendarViewButtonForeground}"> |
354 | 356 | <Button.Content> |
355 | 357 | <TextBlock |
|
369 | 371 | VerticalAlignment="Center" |
370 | 372 | Background="Transparent" |
371 | 373 | BorderBrush="Transparent" |
372 | | - Focusable="False" |
| 374 | + Focusable="True" |
373 | 375 | AutomationProperties.Name="Next" |
| 376 | + KeyboardNavigation.TabNavigation="Contained" |
374 | 377 | Foreground="{DynamicResource CalendarViewButtonForeground}"> |
375 | 378 | <Button.Content> |
376 | 379 | <TextBlock |
|
387 | 390 | Grid.Row="1" |
388 | 391 | HorizontalAlignment="Center" |
389 | 392 | VerticalAlignment="Center" |
| 393 | + KeyboardNavigation.TabNavigation="None" |
390 | 394 | Visibility="Visible"> |
391 | 395 | <Grid.ColumnDefinitions> |
392 | 396 | <ColumnDefinition Width="Auto" /> |
|
412 | 416 | Grid.Row="1" |
413 | 417 | HorizontalAlignment="Center" |
414 | 418 | VerticalAlignment="Center"> |
415 | | - <Grid x:Name="PART_YearView" Visibility="Hidden"> |
| 419 | + <Grid x:Name="PART_YearView" Visibility="Hidden" KeyboardNavigation.TabNavigation="None"> |
416 | 420 | <Grid.ColumnDefinitions> |
417 | 421 | <ColumnDefinition Width="Auto" /> |
418 | 422 | <ColumnDefinition Width="Auto" /> |
|
0 commit comments