- Change default font logic

Author: onesounds

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.Drawing;
+using System.Globalization;
 using System.Text.Json.Serialization;
 using System.Windows;
 using CommunityToolkit.Mvvm.DependencyInjection;
@@ -10,6 +12,7 @@
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedModels;
 using Flow.Launcher.ViewModel;
+using SystemFonts = System.Windows.SystemFonts;
 
 namespace Flow.Launcher.Infrastructure.UserSettings
 {
@@ -34,6 +37,24 @@ public void Save()
         }
 
         private string language = Constant.SystemLanguageCode;
+        public static string GetSystemDefaultFont()
+        {
+            try
+            {
+                var font = SystemFonts.MessageFontFamily;
+                
+                if (font.FamilyNames.TryGetValue(System.Windows.Markup.XmlLanguage.GetLanguage("en-US"), out var englishName))
+                {
+                    return englishName;
+                }
+                return font.Source ?? "Segoe UI";
+            }
+            catch
+            {
+                return "Segoe UI";
+            }
+        }
+        
         private string _theme = Constant.DefaultTheme;
         public string Hotkey { get; set; } = $"{KeyConstant.Alt} + {KeyConstant.Space}";
         public string OpenResultModifiers { get; set; } = KeyConstant.Alt;
@@ -85,15 +106,15 @@ public string Theme
         public double QueryBoxFontSize { get; set; } = 18;
         public double ResultItemFontSize { get; set; } = 16;
         public double ResultSubItemFontSize { get; set; } = 13;
-        public string QueryBoxFont { get; set; } = FontFamily.GenericSansSerif.Name;
+        public string QueryBoxFont { get; set; } = GetSystemDefaultFont();
         public string QueryBoxFontStyle { get; set; }
         public string QueryBoxFontWeight { get; set; }
         public string QueryBoxFontStretch { get; set; }
-        public string ResultFont { get; set; } = FontFamily.GenericSansSerif.Name;
+        public string ResultFont { get; set; } = GetSystemDefaultFont();
         public string ResultFontStyle { get; set; }
         public string ResultFontWeight { get; set; }
         public string ResultFontStretch { get; set; }
-        public string ResultSubFont { get; set; } = FontFamily.GenericSansSerif.Name;
+        public string ResultSubFont { get; set; } = GetSystemDefaultFont();
         public string ResultSubFontStyle { get; set; }
         public string ResultSubFontWeight { get; set; }
         public string ResultSubFontStretch { get; set; }
@@ -140,7 +161,6 @@ public string PlaceholderText
                 }
             }
         }
-
         public int CustomExplorerIndex { get; set; } = 0;
 
         [JsonIgnore]

Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Windows;
 using System.Globalization;
 using System.IO;
@@ -21,7 +22,7 @@ namespace Flow.Launcher.SettingPages.ViewModels;
 
 public partial class SettingsPaneThemeViewModel : BaseModel
 {
-    private const string DefaultFont = "Segoe UI";
+    private string DefaultFont = Settings.GetSystemDefaultFont();
     public string BackdropSubText => !Win32Helper.IsBackdropSupported() ? App.API.GetTranslation("BackdropTypeDisabledToolTip") : ""; 
     public Settings Settings { get; }
     private readonly Theme _theme = Ioc.Default.GetRequiredService<Theme>();
@@ -507,4 +508,5 @@ public void Reset()
         WindowHeightSize = 42;
         ItemHeightSize = 58;
     }
+   
 }