From c3f02f18ae20bdc870c4acf91f9ff84b78ae2640 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 23 Jun 2020 02:47:52 -0400
Subject: [PATCH 1/2] Fluent HighVisibility focus adorner

---
 src/Avalonia.Themes.Fluent/FocusAdorner.xaml | 44 +++++++++++++++-----
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/FocusAdorner.xaml b/src/Avalonia.Themes.Fluent/FocusAdorner.xaml
index 2d5e369573..21e6ef90b6 100644
--- a/src/Avalonia.Themes.Fluent/FocusAdorner.xaml
+++ b/src/Avalonia.Themes.Fluent/FocusAdorner.xaml
@@ -1,10 +1,34 @@
-<Style xmlns="https://github.com/avaloniaui" Selector=":is(Control)">
-  <Setter Property="FocusAdorner">
-    <FocusAdornerTemplate>
-      <Rectangle Stroke="Black"
-                 StrokeThickness="1"
-                 StrokeDashArray="1,2"
-                 Margin="1"/>
-    </FocusAdornerTemplate>
-  </Setter>
-</Style>
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Styles.Resources>
+    <Thickness x:Key="SystemControlFocusVisualMargin">0</Thickness>
+    <Thickness x:Key="SystemControlFocusVisualPrimaryThickness">2</Thickness>
+    <Thickness x:Key="SystemControlFocusVisualSecondaryThickness">1</Thickness>
+  </Styles.Resources>
+
+  <!--  HighVisibility FocusAdorner  -->
+  <Style Selector=":is(Control)">
+    <Setter Property="FocusAdorner">
+      <FocusAdornerTemplate>
+        <Border BorderThickness="{StaticResource SystemControlFocusVisualPrimaryThickness}"
+                BorderBrush="{DynamicResource SystemControlFocusVisualPrimaryBrush}"
+                Margin="{StaticResource SystemControlFocusVisualMargin}">
+          <Border BorderThickness="{StaticResource SystemControlFocusVisualSecondaryThickness}"
+                  BorderBrush="{DynamicResource SystemControlFocusVisualSecondaryBrush}" />
+        </Border>
+      </FocusAdornerTemplate>
+    </Setter>
+  </Style>
+
+  <!--  DottedLine FocusAdorner  -->
+  <Style Selector=":is(Control).DottedLineFocusAdorner">
+    <Setter Property="FocusAdorner">
+      <FocusAdornerTemplate>
+        <Rectangle Stroke="{StaticResource SystemControlFocusVisualPrimaryBrush}"
+                   StrokeThickness="1"
+                   StrokeDashArray="1,2"
+                   Margin="1" />
+      </FocusAdornerTemplate>
+    </Setter>
+  </Style>
+</Styles>

From 4da5f436f1e17f7b7ee618b97c2d43d2684a6b2c Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 23 Jun 2020 03:11:54 -0400
Subject: [PATCH 2/2] Allow to set DottedLineFocusAdorner only per Window to
 match WinUI

---
 src/Avalonia.Themes.Fluent/FocusAdorner.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Themes.Fluent/FocusAdorner.xaml b/src/Avalonia.Themes.Fluent/FocusAdorner.xaml
index 21e6ef90b6..f20dc2e650 100644
--- a/src/Avalonia.Themes.Fluent/FocusAdorner.xaml
+++ b/src/Avalonia.Themes.Fluent/FocusAdorner.xaml
@@ -21,7 +21,7 @@
   </Style>
 
   <!--  DottedLine FocusAdorner  -->
-  <Style Selector=":is(Control).DottedLineFocusAdorner">
+  <Style Selector="Window.DottedLineFocusAdorner :is(Control)">
     <Setter Property="FocusAdorner">
       <FocusAdornerTemplate>
         <Rectangle Stroke="{StaticResource SystemControlFocusVisualPrimaryBrush}"