tree view focus visuals

Author: mou-haz

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

@@ -42,6 +42,7 @@
         <Setter Property="chelper:ControlHelper.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
         <Setter Property="chelper:FocusVisualHelper.UseSystemFocusVisuals" Value="{DynamicResource UseSystemFocusVisuals}" />
+        <Setter Property="chelper:FocusVisualHelper.FocusVisualMargin" Value="0,-1,0,-1" />
         <Setter Property="chelper:TreeViewItemHelper.IsEnabled" Value="True" />
         <Setter Property="chelper:TreeViewItemHelper.GlyphBrush" Value="{DynamicResource TreeViewItemForeground}" />
         <Setter Property="Template">
@@ -61,7 +62,8 @@
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
-                            SnapsToDevicePixels="true">
+                            SnapsToDevicePixels="true"
+                            chelper:FocusVisualHelper.IsTemplateFocusTarget="True">
                             <Grid>
                                 <Rectangle
                                     x:Name="SelectionIndicator"
@@ -325,6 +327,7 @@
     <Style BasedOn="{StaticResource DefaultTreeViewItemStyle}" TargetType="TreeViewItem" />
 
     <Style x:Key="DefaultTreeViewStyle" TargetType="TreeView">
+        <Setter Property="IsTabStop" Value="False" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />

source/iNKORE.UI.WPF.Modern/Themes/Schemes/Dark.xaml

@@ -2636,7 +2636,7 @@
 
     <Thickness x:Key="TreeViewItemBorderThemeThickness">0</Thickness>
     <Thickness x:Key="TreeViewItemPresenterMargin">4,2</Thickness>
-    <Thickness x:Key="TreeViewItemPresenterPadding">0,3,0,3</Thickness>
+    <Thickness x:Key="TreeViewItemPresenterPadding">0,5,0,5</Thickness>
     <Thickness x:Key="TreeViewItemMultiSelectSelectedItemBorderMargin">0</Thickness>
     <sys:Double x:Key="TreeViewItemMinHeight">28</sys:Double>
     <sys:Double x:Key="TreeViewItemMultiSelectCheckBoxMinHeight">28</sys:Double>

source/iNKORE.UI.WPF.Modern/Themes/Schemes/HighContrast.xaml

@@ -2532,7 +2532,7 @@
 
     <Thickness x:Key="TreeViewItemBorderThemeThickness">1</Thickness>
     <Thickness x:Key="TreeViewItemPresenterMargin">4,2</Thickness>
-    <Thickness x:Key="TreeViewItemPresenterPadding">0,3,0,3</Thickness>
+    <Thickness x:Key="TreeViewItemPresenterPadding">0,5,0,5</Thickness>
     <Thickness x:Key="TreeViewItemMultiSelectSelectedItemBorderMargin">1</Thickness>
     <sys:Double x:Key="TreeViewItemMinHeight">28</sys:Double>
     <sys:Double x:Key="TreeViewItemMultiSelectCheckBoxMinHeight">28</sys:Double>

source/iNKORE.UI.WPF.Modern/Themes/Schemes/Light.xaml

@@ -2652,7 +2652,7 @@
 
     <Thickness x:Key="TreeViewItemBorderThemeThickness">0</Thickness>
     <Thickness x:Key="TreeViewItemPresenterMargin">4,2</Thickness>
-    <Thickness x:Key="TreeViewItemPresenterPadding">0,3,0,3</Thickness>
+    <Thickness x:Key="TreeViewItemPresenterPadding">0,5,0,5</Thickness>
     <Thickness x:Key="TreeViewItemMultiSelectSelectedItemBorderMargin">0</Thickness>
     <sys:Double x:Key="TreeViewItemMinHeight">28</sys:Double>
     <sys:Double x:Key="TreeViewItemMultiSelectCheckBoxMinHeight">28</sys:Double>