Skip to content

[Fix] Context Menu: Remove tab navigation for context menu & menu items #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Jack251970 wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

[Fix] Context Menu: Remove tab navigation for context menu & menu items #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
22b73ed
Remove tab navigation for context menu & menu items
Jack251970 Sep 10, 2025
20c265b
Support DirectionalNavigation
Jack251970 Sep 16, 2025
3aa4f1c
Remove TabNavigation
Jack251970 Sep 16, 2025
4570774
Let items get focus
Jack251970 Sep 16, 2025
dc797a7
Add focus visual back
Jack251970 Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions source/iNKORE.UI.WPF.Modern/Themes/Controls/ContextMenu.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
<Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
<Setter Property="FontStyle" Value="Normal" />
<Setter Property="IsTabStop" Value="False" />
<Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
<Setter Property="KeyboardNavigation.IsTabStop" Value="False" />
<Setter Property="FontWeight" Value="Normal" />
<Setter Property="Grid.IsSharedSizeScope" Value="true" />
<Setter Property="HasDropShadow" Value="{DynamicResource {x:Static SystemParameters.DropShadowKey}}" />
Expand Down Expand Up @@ -49,6 +52,7 @@
TypeInTargetAssembly={x:Type FrameworkElement}}}">
<ItemsPresenter
KeyboardNavigation.DirectionalNavigation="Cycle"
KeyboardNavigation.TabNavigation="None"
RenderOptions.ClearTypeHint="Enabled"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</local:ScrollViewerEx>
Expand Down
7 changes: 3 additions & 4 deletions source/iNKORE.UI.WPF.Modern/Themes/Controls/MenuItem.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
<ItemsPresenter
Grid.IsSharedSizeScope="true"
KeyboardNavigation.DirectionalNavigation="Cycle"
KeyboardNavigation.TabNavigation="Cycle"
KeyboardNavigation.TabNavigation="None"
RenderOptions.ClearTypeHint="Enabled"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</local:ScrollViewerEx>
Expand Down Expand Up @@ -342,7 +342,7 @@
<ItemsPresenter
Grid.IsSharedSizeScope="true"
KeyboardNavigation.DirectionalNavigation="Cycle"
KeyboardNavigation.TabNavigation="Cycle"
KeyboardNavigation.TabNavigation="None"
RenderOptions.ClearTypeHint="Enabled"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</local:ScrollViewerEx>
Expand Down Expand Up @@ -402,6 +402,7 @@
<Setter Property="Padding" Value="{DynamicResource MenuFlyoutItemThemePadding}" />
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="ScrollViewer.PanningMode" Value="Both" />
<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
Expand All @@ -416,7 +417,6 @@
<Setter Property="BorderThickness" Value="{DynamicResource MenuBarItemBorderThickness}" />
<Setter Property="Template" Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelHeaderTemplateKey}}" />
<Setter Property="VerticalContentAlignment" Value="Stretch" />
<Setter Property="IsTabStop" Value="True" />
<Setter Property="Header" Value="Item" />
<Setter Property="Height" Value="{DynamicResource MenuBarHeight}" />
</Trigger>
Expand All @@ -426,7 +426,6 @@
<Setter Property="BorderThickness" Value="{DynamicResource MenuBarItemBorderThickness}" />
<Setter Property="Template" Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelItemTemplateKey}}" />
<Setter Property="VerticalContentAlignment" Value="Stretch" />
<Setter Property="IsTabStop" Value="True" />
<Setter Property="Header" Value="Item" />
<Setter Property="Height" Value="{DynamicResource MenuBarHeight}" />
</Trigger>
Expand Down
Loading