Skip to content

Commit 96211df

Browse files
committed
assign focus visual target
focus visual target for: hyperlink button radio button button command bar menu items expander
1 parent 5d7cc7d commit 96211df

File tree

8 files changed

+11
-0
lines changed

8 files changed

+11
-0
lines changed

source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/HyperlinkButton/HyperlinkButton.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
BorderBrush="{TemplateBinding BorderBrush}"
3131
BorderThickness="{TemplateBinding BorderThickness}"
3232
CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
33+
ui:FocusVisualHelper.IsTemplateFocusTarget="True"
3334
SnapsToDevicePixels="True">
3435
<Border
3536
x:Name="Border"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
BorderBrush="{TemplateBinding BorderBrush}"
3434
BorderThickness="{TemplateBinding BorderThickness}"
3535
CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
36+
chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
3637
SnapsToDevicePixels="True">
3738
<Border
3839
x:Name="Border"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
BorderBrush="{TemplateBinding BorderBrush}"
4444
BorderThickness="{TemplateBinding BorderThickness}"
4545
CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
46+
chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
4647
SnapsToDevicePixels="True">
4748
<local:ContentPresenterEx
4849
x:Name="ContentPresenter"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,7 @@
560560
IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
561561
IsEnabled="{TemplateBinding IsEnabled}"
562562
Style="{DynamicResource ExpanderCardHeaderDownStyle}"
563+
chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
563564
Tag="{TemplateBinding chelper:ControlHelper.CornerRadius}" />
564565
<!-- The clip is a composition clip applied in code -->
565566
<Border x:Name="ExpanderContentClip" DockPanel.Dock="Bottom">

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
Margin="{DynamicResource MenuBarItemMargin}"
5151
Background="{TemplateBinding Background}"
5252
CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
53+
chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
5354
SnapsToDevicePixels="True">
5455
<Grid>
5556
<Border
@@ -86,6 +87,7 @@
8687
Margin="{DynamicResource MenuBarItemMargin}"
8788
Background="{TemplateBinding Background}"
8889
CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
90+
chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
8991
SnapsToDevicePixels="True">
9092
<Grid>
9193
<Border
@@ -168,6 +170,7 @@
168170
BorderBrush="{TemplateBinding BorderBrush}"
169171
BorderThickness="{TemplateBinding BorderThickness}"
170172
CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
173+
chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
171174
SnapsToDevicePixels="true">
172175
<Grid x:Name="AnimationRoot">
173176
<Grid.ColumnDefinitions>
@@ -269,6 +272,7 @@
269272
BorderBrush="{TemplateBinding BorderBrush}"
270273
BorderThickness="{TemplateBinding BorderThickness}"
271274
CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
275+
chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
272276
SnapsToDevicePixels="True">
273277
<Grid x:Name="AnimationRoot">
274278
<Grid.ColumnDefinitions>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
x:Name="RootGrid"
3838
Background="{TemplateBinding Background}"
3939
CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
40+
chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
4041
SnapsToDevicePixels="True">
4142
<local:FontIcon
4243
x:Name="Content"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
HorizontalAlignment="Stretch"
4141
Background="{TemplateBinding Background}"
4242
CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
43+
chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
4344
SnapsToDevicePixels="True">
4445
<Grid>
4546
<Grid.ColumnDefinitions>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
BorderBrush="{TemplateBinding BorderBrush}"
3737
BorderThickness="{TemplateBinding BorderThickness}"
3838
CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
39+
chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
3940
SnapsToDevicePixels="True">
4041
<Grid>
4142
<Grid.ColumnDefinitions>

0 commit comments

Comments
 (0)