From dfd72016624109a9c64ff8a5e588584ef34e37a4 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Sat, 27 Oct 2018 13:48:32 +0800
Subject: [PATCH 1/7] Change the default font to system default.

---
 src/Avalonia.Visuals/Media/FontFamily.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Visuals/Media/FontFamily.cs b/src/Avalonia.Visuals/Media/FontFamily.cs
index 70a4aee4cd..f36062f182 100644
--- a/src/Avalonia.Visuals/Media/FontFamily.cs
+++ b/src/Avalonia.Visuals/Media/FontFamily.cs
@@ -48,7 +48,7 @@ namespace Avalonia.Media
         /// <summary>
         /// Represents the default font family
         /// </summary>
-        public static FontFamily Default => new FontFamily("Courier New");
+        public static FontFamily Default => new FontFamily("system-ui");
 
         /// <summary>
         /// Gets the primary family name of the font family.

From 0094c4cf8741dba0f21e95a7aa865d7c6650a124 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Mon, 29 Oct 2018 19:10:38 +0800
Subject: [PATCH 2/7] Fix unit test by specifying the font in the test image.

---
 tests/Avalonia.RenderTests/Controls/TextBlockTests.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs b/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs
index 80b850635d..63e1578145 100644
--- a/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs
@@ -25,6 +25,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
         {
             Decorator target = new Decorator
             {
+                FontFamily = new FontFamily("Courier New"),
                 Padding = new Thickness(8),
                 Width = 200,
                 Height = 200,

From 57a896e878569ab72802214bb92c7744cac00122 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Mon, 29 Oct 2018 19:12:38 +0800
Subject: [PATCH 3/7] Remove hardcoded fonts on our theme definition.

---
 src/Avalonia.HtmlRenderer/external                     | 1 +
 src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml | 1 -
 src/Avalonia.Themes.Default/Window.xaml                | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)
 create mode 160000 src/Avalonia.HtmlRenderer/external

diff --git a/src/Avalonia.HtmlRenderer/external b/src/Avalonia.HtmlRenderer/external
new file mode 160000
index 0000000000..43df78f4d1
--- /dev/null
+++ b/src/Avalonia.HtmlRenderer/external
@@ -0,0 +1 @@
+Subproject commit 43df78f4d1bb09d05021f062cb15e939e3e1771d
diff --git a/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml b/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml
index de364c0108..bc06ab010e 100644
--- a/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml
+++ b/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml
@@ -1,6 +1,5 @@
 <Style xmlns="https://github.com/avaloniaui" Selector="EmbeddableControlRoot">
   <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-  <Setter Property="FontFamily" Value="Segoe UI"/>
   <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
   <Setter Property="Template">
     <ControlTemplate>
diff --git a/src/Avalonia.Themes.Default/Window.xaml b/src/Avalonia.Themes.Default/Window.xaml
index f36e091e55..611f8ebece 100644
--- a/src/Avalonia.Themes.Default/Window.xaml
+++ b/src/Avalonia.Themes.Default/Window.xaml
@@ -1,6 +1,5 @@
 <Style xmlns="https://github.com/avaloniaui" Selector="Window">
   <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-  <Setter Property="FontFamily" Value="Segoe UI"/>
   <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
   <Setter Property="Template">
     <ControlTemplate>

From 382047933fc6a67111b5f7c47208ee61d56b3904 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Mon, 29 Oct 2018 19:15:52 +0800
Subject: [PATCH 4/7] replace the placebo fontfamily text into `String.Empty`

---
 src/Avalonia.Visuals/Media/FontFamily.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Visuals/Media/FontFamily.cs b/src/Avalonia.Visuals/Media/FontFamily.cs
index f36062f182..16dba573fd 100644
--- a/src/Avalonia.Visuals/Media/FontFamily.cs
+++ b/src/Avalonia.Visuals/Media/FontFamily.cs
@@ -48,7 +48,7 @@ namespace Avalonia.Media
         /// <summary>
         /// Represents the default font family
         /// </summary>
-        public static FontFamily Default => new FontFamily("system-ui");
+        public static FontFamily Default => new FontFamily(String.Empty);
 
         /// <summary>
         /// Gets the primary family name of the font family.

From 9a2a3d78a8aaf7ed1a9399c5449c750e12e4a859 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Mon, 29 Oct 2018 20:56:26 +0800
Subject: [PATCH 5/7] Remove html renderer artifact from previous testing.

---
 src/Avalonia.HtmlRenderer/external | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 src/Avalonia.HtmlRenderer/external

diff --git a/src/Avalonia.HtmlRenderer/external b/src/Avalonia.HtmlRenderer/external
deleted file mode 160000
index 43df78f4d1..0000000000
--- a/src/Avalonia.HtmlRenderer/external
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 43df78f4d1bb09d05021f062cb15e939e3e1771d

From cfa39c9d0da94eca03884387c592326f251cc7d4 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Mon, 29 Oct 2018 21:42:05 +0800
Subject: [PATCH 6/7] fix wrongly placed fontfamily parameter

---
 tests/Avalonia.RenderTests/Controls/TextBlockTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs b/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs
index 63e1578145..8a8ed4cb4a 100644
--- a/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs
@@ -25,12 +25,12 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
         {
             Decorator target = new Decorator
             {
-                FontFamily = new FontFamily("Courier New"),
                 Padding = new Thickness(8),
                 Width = 200,
                 Height = 200,
                 Child = new TextBlock
                 {
+                    FontFamily = new FontFamily("Courier New"),
                     Background = Brushes.Red,
                     FontSize = 12,
                     Foreground = Brushes.Black,

From d4b82e5af7002956a53c8e172a062190811d612e Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Mon, 29 Oct 2018 22:11:19 +0800
Subject: [PATCH 7/7] Fix yet another visual test

---
 tests/Avalonia.RenderTests/Media/VisualBrushTests.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs b/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs
index 3a1f7adb2d..6f90dfd19e 100644
--- a/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs
+++ b/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs
@@ -29,7 +29,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
 
         private Control Visual
         {
-            get 
+            get
             {
                 return new Panel
                 {
@@ -83,7 +83,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             await RenderToFile(target);
             CompareImages();
         }
-        
+
 #if AVALONIA_SKIA_SKIP_FAIL
         [Fact(Skip = "FIXME")]
 #else
@@ -270,7 +270,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             await RenderToFile(target);
             CompareImages();
         }
-        
+
         [Fact]
         public async Task VisualBrush_NoStretch_NoTile_BottomRightQuarterSource_BottomRightQuarterDest()
         {
@@ -429,6 +429,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
                             HorizontalAlignment = HorizontalAlignment.Left,
                             Child = new TextBlock
                             {
+                                FontFamily = new FontFamily("Courier New"),
                                 Text = "Visual"
                             }
                         }),