From e8d59576d56e72526b2b590c569ef53e4afe9705 Mon Sep 17 00:00:00 2001
From: Etienne BAUDOUX <ebaudoux@outlook.com>
Date: Sat, 16 Oct 2021 21:12:07 -0700
Subject: [PATCH] Use any font in DevToys editor

---
 src/dev/impl/DevToys/App.xaml.cs                    |  6 +++---
 .../DevToys/Core/Settings/PredefinedSettings.cs     |  2 +-
 .../Tools/Settings/SettingsToolViewModel.cs         | 13 ++++---------
 .../Views/Tools/Settings/SettingsToolPage.xaml      |  5 +++++
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/dev/impl/DevToys/App.xaml.cs b/src/dev/impl/DevToys/App.xaml.cs
index fc0df99eb9..6f52815901 100644
--- a/src/dev/impl/DevToys/App.xaml.cs
+++ b/src/dev/impl/DevToys/App.xaml.cs
@@ -249,11 +249,11 @@ private async Task ValidateDefaultTextEditorFontAsync()
 
             if (!systemFonts.Contains(currentFont))
             {
-                for (int i = 0; i < PredefinedSettings.SupportedFonts.Length; i++)
+                for (int i = 0; i < PredefinedSettings.DefaultFonts.Length; i++)
                 {
-                    if (systemFonts.Contains(PredefinedSettings.SupportedFonts[i]))
+                    if (systemFonts.Contains(PredefinedSettings.DefaultFonts[i]))
                     {
-                        settingsProvider.SetSetting(PredefinedSettings.TextEditorFont, PredefinedSettings.SupportedFonts[i]);
+                        settingsProvider.SetSetting(PredefinedSettings.TextEditorFont, PredefinedSettings.DefaultFonts[i]);
                         return;
                     }
                 }
diff --git a/src/dev/impl/DevToys/Core/Settings/PredefinedSettings.cs b/src/dev/impl/DevToys/Core/Settings/PredefinedSettings.cs
index 50e9eb4637..1f03cf9138 100644
--- a/src/dev/impl/DevToys/Core/Settings/PredefinedSettings.cs
+++ b/src/dev/impl/DevToys/Core/Settings/PredefinedSettings.cs
@@ -62,7 +62,7 @@ public static readonly SettingDefinition<bool> SmartDetectionPaste
                 isRoaming: true,
                 defaultValue: true);
 
-        public static readonly string[] SupportedFonts
+        public static readonly string[] DefaultFonts
             = new[]
             {
                 "Fira Code",
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolViewModel.cs b/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolViewModel.cs
index 6368e544aa..77eb506465 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolViewModel.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolViewModel.cs
@@ -131,7 +131,7 @@ public SettingsToolViewModel(
             RateAndReviewCommand = new AsyncRelayCommand(ExecuteRateAndReviewCommandAsync);
             OpenLogsCommand = new AsyncRelayCommand(ExecuteOpenLogsCommandAsync);
 
-            LoadSupportedFontsAsync().Forget();
+            LoadFonts();
         }
 
         #region CopyVersionCommand
@@ -224,18 +224,13 @@ private async Task ExecuteOpenLogsCommandAsync()
 
         #endregion
 
-        private async Task LoadSupportedFontsAsync()
+        private void LoadFonts()
         {
-            await TaskScheduler.Default;
-
             string[] systemFonts = CanvasTextFormat.GetSystemFontFamilies();
 
-            for (int i = 0; i < PredefinedSettings.SupportedFonts.Length; i++)
+            for (int i = 0; i < systemFonts.Length; i++)
             {
-                if (systemFonts.Contains(PredefinedSettings.SupportedFonts[i]))
-                {
-                    SupportedFonts.Add(PredefinedSettings.SupportedFonts[i]);
-                }
+                SupportedFonts.Add(systemFonts[i]);
             }
 
             OnPropertyChanged(nameof(TextEditorFont));
diff --git a/src/dev/impl/DevToys/Views/Tools/Settings/SettingsToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/Settings/SettingsToolPage.xaml
index 5160d842b9..1d58f357bc 100644
--- a/src/dev/impl/DevToys/Views/Tools/Settings/SettingsToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/Settings/SettingsToolPage.xaml
@@ -86,6 +86,11 @@
             <ComboBox
                 ItemsSource="{x:Bind ViewModel.SupportedFonts, Mode=OneWay}"
                 SelectedValue="{x:Bind ViewModel.TextEditorFont, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding}" FontFamily="{Binding}"/>
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
             </ComboBox>
         </controls:ExpandableSettingControl>
         <controls:ExpandableSettingControl