Skip to content

Commit 96b1018

Browse files
committed
calendarview tab focus visuals
1 parent 288b8b8 commit 96b1018

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

source/iNKORE.UI.WPF.Modern/Themes/Controls/Calendar.xaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,9 @@
464464
<DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_MonthView" Storyboard.TargetProperty="Opacity">
465465
<DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
466466
</DoubleAnimationUsingKeyFrames>
467+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_MonthView" Storyboard.TargetProperty="Visibility">
468+
<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Hidden}" />
469+
</ObjectAnimationUsingKeyFrames>
467470
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YearView" Storyboard.TargetProperty="Visibility">
468471
<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
469472
</ObjectAnimationUsingKeyFrames>
@@ -536,6 +539,9 @@
536539
<DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_MonthView" Storyboard.TargetProperty="Opacity">
537540
<DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
538541
</DoubleAnimationUsingKeyFrames>
542+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_MonthView" Storyboard.TargetProperty="Visibility">
543+
<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Hidden}" />
544+
</ObjectAnimationUsingKeyFrames>
539545
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YearView" Storyboard.TargetProperty="Visibility">
540546
<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
541547
</ObjectAnimationUsingKeyFrames>
@@ -628,7 +634,7 @@
628634
<Setter Property="VerticalContentAlignment" Value="Center" />
629635
<Setter Property="FocusVisualStyle" Value="{StaticResource EllipticalFocusStyle}"/>
630636
<Setter Property="chelper:FocusVisualHelper.UseSystemFocusVisuals" Value="True" />
631-
<Setter Property="chelper:FocusVisualHelper.FocusVisualMargin" Value="-3" />
637+
<Setter Property="chelper:FocusVisualHelper.FocusVisualMargin" Value="-4,-3.5,-3.5,-3" />
632638
<Setter Property="Template">
633639
<Setter.Value>
634640
<ControlTemplate TargetType="CalendarDayButton">
@@ -687,6 +693,8 @@
687693
</Trigger>
688694
<!-- Selected -->
689695
<Trigger Property="IsSelected" Value="True">
696+
<Setter Property="IsTabStop" Value="True" />
697+
<Setter Property="TabIndex" Value="4" />
690698
<Setter TargetName="NormalText" Property="Foreground" Value="{DynamicResource CalendarViewSelectedForeground}" />
691699
<Setter TargetName="HighlightBorder" Property="Stroke" Value="{DynamicResource CalendarViewSelectedBorderBrush}" />
692700
</Trigger>
@@ -739,6 +747,10 @@
739747
<Setter TargetName="NormalText" Property="FontWeight" Value="{DynamicResource CalendarViewTodayFontWeight}" />
740748
<Setter TargetName="NormalText" Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}" />
741749
</Trigger>
750+
<Trigger Property="IsToday" Value="True">
751+
<Setter Property="IsTabStop" Value="True" />
752+
<Setter Property="TabIndex" Value="5" />
753+
</Trigger>
742754
<MultiTrigger>
743755
<MultiTrigger.Conditions>
744756
<Condition Property="IsBlackedOut" Value="True" />
@@ -857,6 +869,8 @@
857869
</Trigger>
858870
<!-- Selected -->
859871
<Trigger Property="HasSelectedDays" Value="True">
872+
<Setter Property="IsTabStop" Value="True" />
873+
<Setter Property="TabIndex" Value="4" />
860874
<Setter TargetName="Background" Property="Fill" Value="{DynamicResource CalendarViewTodayBackground}" />
861875
<Setter TargetName="NormalText" Property="FontWeight" Value="{DynamicResource CalendarViewTodayFontWeight}" />
862876
<Setter TargetName="NormalText" Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}" />

0 commit comments

Comments
 (0)