Merge pull request #180 from walterlv/t/walterlv/navigation-focusable

Don't let the ItemsControls in Navigation Fluents focusable.
lepoco · May 11, 2022 · 0c8531e · 0c8531e
2 parents ac5ba87 + c1f5dce
commit 0c8531e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/WPFUI/Styles/Controls/NavigationFluent.xaml b/src/WPFUI/Styles/Controls/NavigationFluent.xaml
@@ -267,6 +267,7 @@
                             <ItemsControl
                                 Grid.Row="0"
                                 Width="250"
+                                Focusable="False"
                                 ItemsSource="{TemplateBinding Items}"
                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                 ScrollViewer.VerticalScrollBarVisibility="Disabled">
@@ -279,6 +280,7 @@
 
                             <ItemsControl
                                 Grid.Row="1"
+                                Focusable="False"
                                 ItemsSource="{TemplateBinding Footer}"
                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                 ScrollViewer.VerticalScrollBarVisibility="Disabled">
@@ -298,4 +300,4 @@
         </Style.Resources>
     </Style>
 
-</ResourceDictionary>
+</ResourceDictionary>
diff --git a/src/WPFUI/Styles/Controls/NavigationStore.xaml b/src/WPFUI/Styles/Controls/NavigationStore.xaml
@@ -247,6 +247,7 @@
                             <ItemsControl
                                 Grid.Row="0"
                                 Width="250"
+                                Focusable="False"
                                 ItemsSource="{TemplateBinding Items}"
                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                 ScrollViewer.VerticalScrollBarVisibility="Disabled">
@@ -262,6 +263,7 @@
 
                             <ItemsControl
                                 Grid.Row="1"
+                                Focusable="False"
                                 ItemsSource="{TemplateBinding Footer}"
                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                 ScrollViewer.VerticalScrollBarVisibility="Disabled">
@@ -284,4 +286,4 @@
         </Style.Resources>
     </Style>
 
-</ResourceDictionary>
+</ResourceDictionary>