using control CornerRadius for focus visual

Author: mou-haz

source/iNKORE.UI.WPF.Modern/Controls/Helpers/FocusVisualHelper.cs

@@ -532,6 +532,8 @@ public FocusVisualAdorner(Control focusedElement, UIElement adornedElement, Styl
                 SetIsSystemFocusVisual(control, false);
                 control.Style = focusVisualStyle;
                 control.Margin = GetFocusVisualMargin(focusedElement);
+
+                ControlHelper.SetCornerRadius(control, ControlHelper.GetCornerRadius(focusedElement));
                 TransferValue(focusedElement, control, FocusVisualPrimaryBrushProperty);
                 TransferValue(focusedElement, control, FocusVisualPrimaryThicknessProperty);
                 TransferValue(focusedElement, control, FocusVisualSecondaryBrushProperty);

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

@@ -39,6 +39,7 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{DynamicResource ExpanderHeaderBorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
+                        chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
                         CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}">
                         <Grid SnapsToDevicePixels="False">
                             <Grid.ColumnDefinitions>

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

@@ -2672,15 +2672,18 @@
                     <Border
                         BorderBrush="{TemplateBinding chelper:FocusVisualHelper.FocusVisualPrimaryBrush}"
                         BorderThickness="{TemplateBinding chelper:FocusVisualHelper.FocusVisualPrimaryThickness}"
-                        SnapsToDevicePixels="True">
-                        <Border BorderBrush="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryBrush}" BorderThickness="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryThickness}" />
+                        SnapsToDevicePixels="True"
+                        CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}">
+                        <Border CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+                                BorderBrush="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryBrush}" 
+                                BorderThickness="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryThickness}" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="{x:Static SystemParameters.FocusVisualStyleKey}" BasedOn="{m:StaticColor HighVisibilityFocusVisual}" />
+    <Style x:Key="{x:Static SystemParameters.FocusVisualStyleKey}" BasedOn="{StaticResource HighVisibilityFocusVisual}" />
 
 
     <!--Resources for SettingsCard-->

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

@@ -2612,16 +2612,19 @@
             <Setter.Value>
                 <ControlTemplate>
                     <Border
-                        BorderBrush="{m:StaticColor SystemControlFocusVisualPrimaryBrush}"
-                        BorderThickness="2"
-                        SnapsToDevicePixels="True">
-                        <Border BorderBrush="{m:StaticColor SystemControlFocusVisualSecondaryBrush}" BorderThickness="1" />
+                        BorderBrush="{TemplateBinding chelper:FocusVisualHelper.FocusVisualPrimaryBrush}"
+                        BorderThickness="{TemplateBinding chelper:FocusVisualHelper.FocusVisualPrimaryThickness}"
+                        SnapsToDevicePixels="True"
+                        CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}">
+                        <Border CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+                                BorderBrush="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryBrush}" 
+                                BorderThickness="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryThickness}" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="{x:Static SystemParameters.FocusVisualStyleKey}" BasedOn="{m:StaticColor HighVisibilityFocusVisual}" />
+    <Style x:Key="{x:Static SystemParameters.FocusVisualStyleKey}" BasedOn="{StaticResource HighVisibilityFocusVisual}" />
 
 </ResourceDictionary>

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

@@ -2733,15 +2733,18 @@
                     <Border
                         BorderBrush="{TemplateBinding chelper:FocusVisualHelper.FocusVisualPrimaryBrush}"
                         BorderThickness="{TemplateBinding chelper:FocusVisualHelper.FocusVisualPrimaryThickness}"
-                        SnapsToDevicePixels="True">
-                        <Border BorderBrush="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryBrush}" BorderThickness="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryThickness}" />
+                        SnapsToDevicePixels="True"
+                        CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}">
+                        <Border CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+                                BorderBrush="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryBrush}" 
+                                BorderThickness="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryThickness}" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="{x:Static SystemParameters.FocusVisualStyleKey}" BasedOn="{m:StaticColor HighVisibilityFocusVisual}" />
+    <Style x:Key="{x:Static SystemParameters.FocusVisualStyleKey}" BasedOn="{StaticResource HighVisibilityFocusVisual}" />
 
     <!--Project Badge-->
     <Color x:Key="BrandAccentLight">#947EEC</Color>