refactoring

Author: mou-haz

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

@@ -511,23 +511,7 @@ private static void OnFocusVisualIsVisibleChanged(object sender, DependencyPrope
                     {
                         var focusVisualMargin = GetFocusVisualMargin(focusedElement);
 
-                        var cornerRadius = focusedElement.GetValue(ControlHelper.CornerRadiusProperty);
-                        if (cornerRadius != DependencyProperty.UnsetValue && cornerRadius is CornerRadius focusedCornerRadius && focusedCornerRadius != default)
-                        {
-                            var focusVisualCornerRadius = new CornerRadius(
-                                GetSumIfSourceIsNonZero(focusedCornerRadius.TopLeft, -(focusVisualMargin.Left + focusVisualMargin.Top) / 2),
-                                GetSumIfSourceIsNonZero(focusedCornerRadius.TopRight, -(focusVisualMargin.Right + focusVisualMargin.Top) / 2),
-                                GetSumIfSourceIsNonZero(focusedCornerRadius.BottomLeft, -(focusVisualMargin.Left + focusVisualMargin.Bottom) / 2),
-                                GetSumIfSourceIsNonZero(focusedCornerRadius.BottomRight, -(focusVisualMargin.Right + focusVisualMargin.Bottom) / 2));
-                    
-                            ControlHelper.SetCornerRadius(focusVisual, focusVisualCornerRadius);
-                            var topLeftRadius = GetSumIfSourceIsNonZero(focusVisualCornerRadius.TopLeft, GetFocusVisualSecondaryThickness(focusedElement).Left);
-                            var topRightRadius = GetSumIfSourceIsNonZero(focusVisualCornerRadius.TopRight, GetFocusVisualSecondaryThickness(focusedElement).Right);
-                            var bottomRightRadius = GetSumIfSourceIsNonZero(focusVisualCornerRadius.BottomLeft, GetFocusVisualSecondaryThickness(focusedElement).Left);
-                            var bottomLeftRadius = GetSumIfSourceIsNonZero(focusVisualCornerRadius.BottomRight, GetFocusVisualSecondaryThickness(focusedElement).Right);
-
-                            SetFocusVisualPrimaryCornerRadius(focusVisual, new CornerRadius(topLeftRadius, topRightRadius, bottomRightRadius, bottomLeftRadius));
-                        }
+                        ApplyCornerRadiusToFocusVisual(focusVisual, focusedElement, focusVisualMargin);
 
                         TransferValue(focusedElement, focusVisual, FocusVisualPrimaryBrushProperty);
                         TransferValue(focusedElement, focusVisual, FocusVisualPrimaryThicknessProperty);
@@ -556,6 +540,39 @@ private static void OnFocusVisualIsVisibleChanged(object sender, DependencyPrope
             }
         }
 
+        private static void ApplyCornerRadiusToFocusVisual(Control focusVisual, FrameworkElement focusedElement, Thickness focusVisualMargin)
+        {
+            var cornerRadius = GetCornerRadiusForFocusedElement(focusedElement);
+            if (cornerRadius is CornerRadius focusedCornerRadius)
+            {
+                var focusVisualCornerRadius = new CornerRadius(
+                    GetSumIfSourceIsNonZero(focusedCornerRadius.TopLeft, -(focusVisualMargin.Left + focusVisualMargin.Top) / 2),
+                    GetSumIfSourceIsNonZero(focusedCornerRadius.TopRight, -(focusVisualMargin.Right + focusVisualMargin.Top) / 2),
+                    GetSumIfSourceIsNonZero(focusedCornerRadius.BottomLeft, -(focusVisualMargin.Left + focusVisualMargin.Bottom) / 2),
+                    GetSumIfSourceIsNonZero(focusedCornerRadius.BottomRight, -(focusVisualMargin.Right + focusVisualMargin.Bottom) / 2));
+
+                ControlHelper.SetCornerRadius(focusVisual, focusVisualCornerRadius);
+                var topLeftRadius = GetSumIfSourceIsNonZero(focusVisualCornerRadius.TopLeft, GetFocusVisualSecondaryThickness(focusedElement).Left);
+                var topRightRadius = GetSumIfSourceIsNonZero(focusVisualCornerRadius.TopRight, GetFocusVisualSecondaryThickness(focusedElement).Right);
+                var bottomRightRadius = GetSumIfSourceIsNonZero(focusVisualCornerRadius.BottomLeft, GetFocusVisualSecondaryThickness(focusedElement).Left);
+                var bottomLeftRadius = GetSumIfSourceIsNonZero(focusVisualCornerRadius.BottomRight, GetFocusVisualSecondaryThickness(focusedElement).Right);
+
+                SetFocusVisualPrimaryCornerRadius(focusVisual, new CornerRadius(topLeftRadius, topRightRadius, bottomRightRadius, bottomLeftRadius));
+            }
+        }
+
+        private static CornerRadius? GetCornerRadiusForFocusedElement(FrameworkElement focusedElement)
+        {
+            var cornerRadiusTarget = focusedElement.GetValue(TemplateFocusTargetProperty) as FrameworkElement;
+            cornerRadiusTarget ??= focusedElement;
+            return cornerRadiusTarget switch
+            {
+                var _ when cornerRadiusTarget.GetValue(Border.CornerRadiusProperty) is CornerRadius borderResult => borderResult,
+                var _ when cornerRadiusTarget.GetValue(ControlHelper.CornerRadiusProperty) is CornerRadius controlResult => controlResult,
+                _ => null
+            };
+        }
+
         private static void TransferValue(DependencyObject source, DependencyObject target, DependencyProperty dp)
         {
             if (!source.HasDefaultValue(dp))
@@ -587,26 +604,7 @@ public FocusVisualAdorner(Control focusedElement, UIElement adornedElement, Styl
                 var focusVisualMargin = GetFocusVisualMargin(focusedElement);
                 control.Margin = focusVisualMargin;
 
-                var cornerRadius = focusedElement.GetValue(ControlHelper.CornerRadiusProperty);
-                if (cornerRadius != DependencyProperty.UnsetValue && cornerRadius is CornerRadius focusedCornerRadius &&
-                    focusedCornerRadius != default)
-                {
-                    var focusVisualCornerRadius = new CornerRadius(
-                        GetSumIfSourceIsNonZero(focusedCornerRadius.TopLeft, -(focusVisualMargin.Left + focusVisualMargin.Top) / 2),
-                        GetSumIfSourceIsNonZero(focusedCornerRadius.TopRight, -(focusVisualMargin.Right + focusVisualMargin.Top) / 2),
-                        GetSumIfSourceIsNonZero(focusedCornerRadius.BottomLeft, -(focusVisualMargin.Left + focusVisualMargin.Bottom) / 2),
-                        GetSumIfSourceIsNonZero(focusedCornerRadius.BottomRight, -(focusVisualMargin.Right + focusVisualMargin.Bottom) / 2));
-
-                    ControlHelper.SetCornerRadius(control, focusVisualCornerRadius);
-                    
-                    var topLeftRadius = GetSumIfSourceIsNonZero(focusVisualCornerRadius.TopLeft, GetFocusVisualSecondaryThickness(focusedElement).Left);
-                    var topRightRadius = GetSumIfSourceIsNonZero(focusVisualCornerRadius.TopRight, GetFocusVisualSecondaryThickness(focusedElement).Right);
-                    var bottomRightRadius = GetSumIfSourceIsNonZero(focusVisualCornerRadius.BottomLeft, GetFocusVisualSecondaryThickness(focusedElement).Left);
-                    var bottomLeftRadius = GetSumIfSourceIsNonZero(focusVisualCornerRadius.BottomRight, GetFocusVisualSecondaryThickness(focusedElement).Right);
-
-                    SetFocusVisualPrimaryCornerRadius(control,
-                        new CornerRadius(topLeftRadius, topRightRadius, bottomRightRadius, bottomLeftRadius));
-                }
+                ApplyCornerRadiusToFocusVisual(control, focusedElement, focusVisualMargin);
 
                 TransferValue(focusedElement, control, FocusVisualPrimaryBrushProperty);
                 TransferValue(focusedElement, control, FocusVisualPrimaryThicknessProperty);