From a28ee701b8a562c6974a4b6139055854881bc45c Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 17 Apr 2025 18:45:31 +0900
Subject: [PATCH 01/12] Add settingwindowfont config and menu

---
 .../UserSettings/Settings.cs                  | 21 ++++----
 .../ViewModels/SettingsPaneAboutViewModel.cs  | 49 +++++++++++++++++++
 .../SettingPages/Views/SettingsPaneAbout.xaml | 46 ++++++++++++++---
 .../Views/SettingsPaneAbout.xaml.cs           | 22 ++++++++-
 Flow.Launcher/SettingWindow.xaml              |  1 +
 Flow.Launcher/SettingWindow.xaml.cs           |  1 +
 .../ViewModel/SettingWindowViewModel.cs       | 26 +++++++++-
 7 files changed, 147 insertions(+), 19 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 0bd1a809b7a..d91574bdc7a 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -65,19 +65,21 @@ public void Save()
             { "pt", "Noto Sans" }
         };
 
-        public static string GetSystemDefaultFont()
+        public static string GetSystemDefaultFont(bool? useNoto = null)
         {
             try
             {
-                var culture = CultureInfo.CurrentCulture;
-                var language = culture.Name; // e.g., "zh-TW"
-                var langPrefix = language.Split('-')[0]; // e.g., "zh"
-
-                // First, try to find by full name, and if not found, fallback to prefix
-                if (TryGetNotoFont(language, out var notoFont) || TryGetNotoFont(langPrefix, out notoFont))
+                if (useNoto != false)
                 {
-                    if (Fonts.SystemFontFamilies.Any(f => f.Source.Equals(notoFont)))
-                        return notoFont;
+                    var culture = CultureInfo.CurrentCulture;
+                    var language = culture.Name; // e.g., "zh-TW"
+                    var langPrefix = language.Split('-')[0]; // e.g., "zh"
+
+                    if (TryGetNotoFont(language, out var notoFont) || TryGetNotoFont(langPrefix, out notoFont))
+                    {
+                        if (Fonts.SystemFontFamilies.Any(f => f.Source.Equals(notoFont)))
+                            return notoFont;
+                    }
                 }
 
                 var font = SystemFonts.MessageFontFamily;
@@ -162,6 +164,7 @@ public string Theme
         public string ResultSubFontStyle { get; set; }
         public string ResultSubFontWeight { get; set; }
         public string ResultSubFontStretch { get; set; }
+        public string SettingWindowFont { get; set; } = GetSystemDefaultFont(false);
         public bool UseGlyphIcons { get; set; } = true;
         public bool UseAnimation { get; set; } = true;
         public bool UseSound { get; set; } = true;
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
index 6cfb9830656..abc7a2d16f2 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Media;
 using CommunityToolkit.Mvvm.Input;
 using Flow.Launcher.Core;
 using Flow.Launcher.Infrastructure;
@@ -268,4 +270,51 @@ private static string BytesToReadableString(long bytes)
 
         return "0 B";
     }
+    
+    public event PropertyChangedEventHandler PropertyChanged;
+    protected virtual void OnPropertyChanged(string propertyName)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+    
+    private string _settingWindowFont;
+
+    public string SettingWindowFont
+    {
+        get => _settings.SettingWindowFont;
+        set
+        {
+            if (_settings.SettingWindowFont != value)
+            {
+                _settings.SettingWindowFont = value;
+                OnPropertyChanged(nameof(SettingWindowFont));
+            }
+        }
+    }
+
+    [RelayCommand]
+    private void ResetSettingWindowFont()
+    {
+        string defaultFont = GetSystemDefaultFont();
+        _settings.SettingWindowFont = defaultFont;
+    }
+
+    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";
+        }
+    }
+
 }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
index f7deee7cfdc..b3991743d4f 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
@@ -12,6 +12,11 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
+    <ui:Page.Resources>
+        <ResourceDictionary>
+            <CollectionViewSource x:Key="SortedFonts" Source="{Binding Source={x:Static Fonts.SystemFontFamilies}}" />
+        </ResourceDictionary>
+    </ui:Page.Resources>
     <ScrollViewer
         Margin="0"
         CanContentScroll="True"
@@ -127,13 +132,40 @@
                 </StackPanel>
             </cc:Card>
 
-            <cc:Card Title="{DynamicResource logLevel}" Icon="&#xE749;">
-                <ComboBox
-                    DisplayMemberPath="Display"
-                    ItemsSource="{Binding LogLevels}"
-                    SelectedValue="{Binding LogLevel}"
-                    SelectedValuePath="Value" />
-            </cc:Card>
+            <cc:ExCard
+                Title="Advanced"
+                Margin="0 14 0 0"
+                Icon="&#xE8B7;">
+                <StackPanel>
+                    <cc:Card
+                        Title="{DynamicResource logLevel}"
+                        Icon="&#xE749;"
+                        Type="Inside">
+                        <ComboBox
+                            DisplayMemberPath="Display"
+                            ItemsSource="{Binding LogLevels}"
+                            SelectedValue="{Binding LogLevel}"
+                            SelectedValuePath="Value" />
+                    </cc:Card>
+                    <cc:Card
+                        Title="Setting Window Font"
+                        Icon="&#xf259;"
+                        Type="Inside">
+                        <StackPanel Orientation="Horizontal">
+                            <Button Command="{Binding ResetSettingWindowFontCommand}" Content="Reset" />
+                            <ComboBox
+                                Margin="12 8 0 8"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Top"
+                                DisplayMemberPath="Source"
+                                ItemsSource="{Binding Source={StaticResource SortedFonts}}"
+                                SelectedValue="{Binding SettingWindowFont, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                SelectedValuePath="Source"
+                                SelectionChanged="SettingWindowFontComboBox_SelectionChanged" />
+                        </StackPanel>
+                    </cc:Card>
+                </StackPanel>
+            </cc:ExCard>
 
             <TextBlock
                 Margin="14 20 0 0"
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs
index 1ecc02aa6b3..cedc196333d 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs
@@ -1,4 +1,7 @@
-using System.Windows.Navigation;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Navigation;
 using Flow.Launcher.Core;
 using Flow.Launcher.SettingPages.ViewModels;
 using Flow.Launcher.Infrastructure.UserSettings;
@@ -28,4 +31,21 @@ private void OnRequestNavigate(object sender, RequestNavigateEventArgs e)
         App.API.OpenUrl(e.Uri.AbsoluteUri);
         e.Handled = true;
     }
+    
+    private void SettingWindowFontComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (sender is ComboBox comboBox && comboBox.SelectedItem is FontFamily selectedFont)
+        {
+            if (DataContext is SettingsPaneAboutViewModel viewModel)
+            {
+                viewModel.SettingWindowFont = selectedFont.Source;
+            
+                // 설정 창 글꼴 즉시 업데이트
+                if (Window.GetWindow(this) is SettingWindow settingWindow)
+                {
+                    settingWindow.FontFamily = selectedFont;
+                }
+            }
+        }
+    }
 }
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index ab27b235a2c..f2cf9fab23f 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -13,6 +13,7 @@
     MinHeight="600"
     d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}"
     Closed="OnClosed"
+    FontFamily="{Binding SettingWindowFont, Mode=TwoWay}"
     Icon="Images\app.ico"
     Left="{Binding SettingWindowLeft, Mode=TwoWay}"
     Loaded="OnLoaded"
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index b4a3ae47a92..70b5a22ede9 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -3,6 +3,7 @@
 using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Interop;
+using System.Windows.Media;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.UserSettings;
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 51afe533d7f..b6fd9555b17 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -1,11 +1,13 @@
-using Flow.Launcher.Infrastructure.UserSettings;
+using System.ComponentModel;
+using System.Windows.Media;
+using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 
 namespace Flow.Launcher.ViewModel;
 
 public partial class SettingWindowViewModel : BaseModel
 {
-    private readonly Settings _settings; 
+    private readonly Settings _settings;
 
     public SettingWindowViewModel(Settings settings)
     {
@@ -43,4 +45,24 @@ public double? SettingWindowLeft
         get => _settings.SettingWindowLeft;
         set => _settings.SettingWindowLeft = value;
     }
+
+    public string SettingWindowFont
+    {
+        get => _settings.SettingWindowFont;
+        set
+        {
+            if (_settings.SettingWindowFont != value)
+            {
+                _settings.SettingWindowFont = value;
+                OnPropertyChanged(nameof(SettingWindowFont));
+            }
+        }
+    }
+
+    public event PropertyChangedEventHandler PropertyChanged;
+
+    protected virtual void OnPropertyChanged(string propertyName)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
 }

From 8674fca082dd74cb503e0a9a4b238a4cb05aa59a Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 19 Apr 2025 11:20:08 +0800
Subject: [PATCH 02/12] Resolve conflicts

---
 .../UserSettings/Settings.cs                  |  2 +-
 Flow.Launcher.Infrastructure/Win32Helper.cs   | 32 +++++++++++++------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 17792c0c13c..52bc63ec61a 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -96,7 +96,7 @@ public string Theme
         public string ResultSubFontStyle { get; set; }
         public string ResultSubFontWeight { get; set; }
         public string ResultSubFontStretch { get; set; }
-        public string SettingWindowFont { get; set; } = GetSystemDefaultFont(false);
+        public string SettingWindowFont { get; set; } = Win32Helper.GetSystemDefaultFont(false);
         public bool UseGlyphIcons { get; set; } = true;
         public bool UseAnimation { get; set; } = true;
         public bool UseSound { get; set; } = true;
diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs
index 6a5af41df28..2788060eb4c 100644
--- a/Flow.Launcher.Infrastructure/Win32Helper.cs
+++ b/Flow.Launcher.Infrastructure/Win32Helper.cs
@@ -628,21 +628,33 @@ public static void OpenImeSettings()
             { "pt", "Noto Sans" }
         };
 
-        public static string GetSystemDefaultFont()
+        /// <summary>
+        /// Gets the system default font.
+        /// </summary>
+        /// <param name="useNoto">
+        /// If true, it will try to find the Noto font for the current culture.
+        /// </param>
+        /// <returns>
+        /// The name of the system default font.
+        /// </returns>
+        public static string GetSystemDefaultFont(bool useNoto = true)
         {
             try
             {
-                var culture = CultureInfo.CurrentCulture;
-                var language = culture.Name; // e.g., "zh-TW"
-                var langPrefix = language.Split('-')[0]; // e.g., "zh"
-
-                // First, try to find by full name, and if not found, fallback to prefix
-                if (TryGetNotoFont(language, out var notoFont) || TryGetNotoFont(langPrefix, out notoFont))
+                if (useNoto)
                 {
-                    // If the font is installed, return it
-                    if (Fonts.SystemFontFamilies.Any(f => f.Source.Equals(notoFont)))
+                    var culture = CultureInfo.CurrentCulture;
+                    var language = culture.Name; // e.g., "zh-TW"
+                    var langPrefix = language.Split('-')[0]; // e.g., "zh"
+
+                    // First, try to find by full name, and if not found, fallback to prefix
+                    if (TryGetNotoFont(language, out var notoFont) || TryGetNotoFont(langPrefix, out notoFont))
                     {
-                        return notoFont;
+                        // If the font is installed, return it
+                        if (Fonts.SystemFontFamilies.Any(f => f.Source.Equals(notoFont)))
+                        {
+                            return notoFont;
+                        }
                     }
                 }
 

From a15b789eb03f8cc7e0174c201b91e53b1a66290c Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 19 Apr 2025 11:25:39 +0800
Subject: [PATCH 03/12] Cleanup codes

---
 .../ViewModels/SettingsPaneAboutViewModel.cs  | 33 ++-----------------
 1 file changed, 2 insertions(+), 31 deletions(-)

diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
index abc7a2d16f2..ee0865f9d93 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Media;
 using CommunityToolkit.Mvvm.Input;
 using Flow.Launcher.Core;
 using Flow.Launcher.Infrastructure;
@@ -271,14 +269,6 @@ private static string BytesToReadableString(long bytes)
         return "0 B";
     }
     
-    public event PropertyChangedEventHandler PropertyChanged;
-    protected virtual void OnPropertyChanged(string propertyName)
-    {
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-    }
-    
-    private string _settingWindowFont;
-
     public string SettingWindowFont
     {
         get => _settings.SettingWindowFont;
@@ -287,7 +277,7 @@ public string SettingWindowFont
             if (_settings.SettingWindowFont != value)
             {
                 _settings.SettingWindowFont = value;
-                OnPropertyChanged(nameof(SettingWindowFont));
+                OnPropertyChanged();
             }
         }
     }
@@ -295,26 +285,7 @@ public string SettingWindowFont
     [RelayCommand]
     private void ResetSettingWindowFont()
     {
-        string defaultFont = GetSystemDefaultFont();
+        string defaultFont = Win32Helper.GetSystemDefaultFont(false);
         _settings.SettingWindowFont = defaultFont;
     }
-
-    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";
-        }
-    }
-
 }

From 3f5e69be7f385cec24097a2479025b5ba569c071 Mon Sep 17 00:00:00 2001
From: Jack Ye <1160210343@qq.com>
Date: Sat, 19 Apr 2025 11:27:43 +0800
Subject: [PATCH 04/12] Fix possible property change issue

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../SettingPages/ViewModels/SettingsPaneAboutViewModel.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
index ee0865f9d93..55d6b0a1c88 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
@@ -286,6 +286,6 @@ public string SettingWindowFont
     private void ResetSettingWindowFont()
     {
         string defaultFont = Win32Helper.GetSystemDefaultFont(false);
-        _settings.SettingWindowFont = defaultFont;
+        SettingWindowFont = defaultFont;
     }
 }

From 647f2bb0a16fd7c5d142469c3365701376fa32dc Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Sat, 19 Apr 2025 15:05:15 +0900
Subject: [PATCH 05/12] Add String

---
 Flow.Launcher/Languages/en.xaml                         | 1 +
 Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index caa9a712910..b66b2ba03cd 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -356,6 +356,7 @@
     <system:String x:Key="logLevel">Log Level</system:String>
     <system:String x:Key="LogLevelDEBUG">Debug</system:String>
     <system:String x:Key="LogLevelINFO">Info</system:String>
+    <system:String x:Key="settingWindowFont">Setting Window Font</system:String>
 
     <!--  FileManager Setting Dialog  -->
     <system:String x:Key="fileManagerWindow">Select File Manager</system:String>
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
index b3991743d4f..44a0490ca19 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
@@ -148,7 +148,7 @@
                             SelectedValuePath="Value" />
                     </cc:Card>
                     <cc:Card
-                        Title="Setting Window Font"
+                        Title="{DynamicResource settingWindowFont}"
                         Icon="&#xf259;"
                         Type="Inside">
                         <StackPanel Orientation="Horizontal">

From 942b29061edfbd9102f63c7d3f14316408cd6954 Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Sat, 19 Apr 2025 15:40:11 +0900
Subject: [PATCH 06/12] Add FontFamily Style

---
 Flow.Launcher/CustomQueryHotkeySetting.xaml   |  1 +
 .../CustomQueryHotkeySetting.xaml.cs          | 21 +++++++-
 Flow.Launcher/CustomShortcutSetting.xaml.cs   | 23 ++++++++-
 Flow.Launcher/SelectBrowserWindow.xaml        | 51 +++++++++----------
 Flow.Launcher/SelectBrowserWindow.xaml.cs     | 17 ++++++-
 Flow.Launcher/SelectFileManagerWindow.xaml    |  1 +
 Flow.Launcher/SelectFileManagerWindow.xaml.cs | 16 ++++++
 7 files changed, 101 insertions(+), 29 deletions(-)

diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml
index 0171e6d79c3..a460ffae023 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml
@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:flowlauncher="clr-namespace:Flow.Launcher"
+    FontFamily="{Binding SettingWindowFont, Mode=TwoWay}"
     Title="{DynamicResource customeQueryHotkeyTitle}"
     Width="530"
     Background="{DynamicResource PopuBGColor}"
diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
index 8b193fa1dee..c377fb2502b 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
@@ -1,6 +1,7 @@
 using Flow.Launcher.Helper;
 using Flow.Launcher.Infrastructure.UserSettings;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Input;
@@ -13,7 +14,25 @@ public partial class CustomQueryHotkeySetting : Window
         private readonly Settings _settings;
         private bool update;
         private CustomPluginHotkey updateCustomHotkey;
-
+        public event PropertyChangedEventHandler PropertyChanged;
+        
+        public string SettingWindowFont
+        {
+            get => _settings.SettingWindowFont;
+            set
+            {
+                if (_settings.SettingWindowFont != value)
+                {
+                    _settings.SettingWindowFont = value;
+                    OnPropertyChanged(nameof(SettingWindowFont));
+                }
+            }
+        }
+        
+        protected virtual void OnPropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
         public CustomQueryHotkeySetting(Settings settings)
         {
             _settings = settings;
diff --git a/Flow.Launcher/CustomShortcutSetting.xaml.cs b/Flow.Launcher/CustomShortcutSetting.xaml.cs
index ecbdea60627..dcfa572f4c1 100644
--- a/Flow.Launcher/CustomShortcutSetting.xaml.cs
+++ b/Flow.Launcher/CustomShortcutSetting.xaml.cs
@@ -1,6 +1,8 @@
 using System;
+using System.ComponentModel;
 using System.Windows;
 using System.Windows.Input;
+using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.SettingPages.ViewModels;
 
 namespace Flow.Launcher
@@ -13,7 +15,26 @@ public partial class CustomShortcutSetting : Window
         private string originalKey { get; } = null;
         private string originalValue { get; } = null;
         private bool update { get; } = false;
-
+        private readonly Settings _settings;
+        public event PropertyChangedEventHandler PropertyChanged;
+        
+        public string SettingWindowFont
+        {
+            get => _settings.SettingWindowFont;
+            set
+            {
+                if (_settings.SettingWindowFont != value)
+                {
+                    _settings.SettingWindowFont = value;
+                    OnPropertyChanged(nameof(SettingWindowFont));
+                }
+            }
+        }
+        
+        protected virtual void OnPropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
         public CustomShortcutSetting(SettingsPaneHotkeyViewModel vm)
         {
             _hotkeyVm = vm;
diff --git a/Flow.Launcher/SelectBrowserWindow.xaml b/Flow.Launcher/SelectBrowserWindow.xaml
index c12879a04bb..b16de277048 100644
--- a/Flow.Launcher/SelectBrowserWindow.xaml
+++ b/Flow.Launcher/SelectBrowserWindow.xaml
@@ -10,6 +10,7 @@
     Width="550"
     Background="{DynamicResource PopuBGColor}"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
+    FontFamily="{Binding SettingWindowFont, Mode=TwoWay}"
     Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
     SizeToContent="Height"
@@ -54,11 +55,11 @@
                     </Button>
                 </Grid>
             </StackPanel>
-            <StackPanel Margin="26,12,26,0">
-                <StackPanel Margin="0,0,0,12">
+            <StackPanel Margin="26 12 26 0">
+                <StackPanel Margin="0 0 0 12">
                     <TextBlock
                         Grid.Column="0"
-                        Margin="0,0,0,0"
+                        Margin="0 0 0 0"
                         FontSize="20"
                         FontWeight="SemiBold"
                         Text="{DynamicResource defaultBrowserTitle}"
@@ -73,7 +74,7 @@
                 </StackPanel>
 
 
-                <StackPanel Margin="14,28,0,0" Orientation="Horizontal">
+                <StackPanel Margin="14 28 0 0" Orientation="Horizontal">
                     <TextBlock
                         Grid.Column="1"
                         HorizontalAlignment="Left"
@@ -84,7 +85,7 @@
                         Name="comboBox"
                         Height="35"
                         MinWidth="200"
-                        Margin="14,0,0,0"
+                        Margin="14 0 0 0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         ItemsSource="{Binding CustomBrowsers}"
@@ -96,11 +97,11 @@
                         </ComboBox.ItemTemplate>
                     </ComboBox>
                     <Button
-                        Margin="10,0,0,0"
+                        Margin="10 0 0 0"
                         Click="btnAdd_Click"
                         Content="{DynamicResource add}" />
                     <Button
-                        Margin="10,0,0,0"
+                        Margin="10 0 0 0"
                         Click="btnDelete_Click"
                         Content="{DynamicResource delete}"
                         IsEnabled="{Binding CustomBrowser.Editable}" />
@@ -108,10 +109,10 @@
                 </StackPanel>
                 <Rectangle
                     Height="1"
-                    Margin="0,20,0,12"
+                    Margin="0 20 0 12"
                     Fill="{DynamicResource SeparatorForeground}" />
                 <StackPanel
-                    Margin="0,0,0,0"
+                    Margin="0 0 0 0"
                     HorizontalAlignment="Stretch"
                     DataContext="{Binding CustomBrowser}"
                     Orientation="Horizontal">
@@ -129,7 +130,7 @@
                         <TextBlock
                             Grid.Row="0"
                             Grid.Column="0"
-                            Margin="14,5,10,0"
+                            Margin="14 5 10 0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             FontSize="14"
@@ -139,7 +140,7 @@
                             Grid.Row="0"
                             Grid.Column="1"
                             Width="Auto"
-                            Margin="10,5,0,0"
+                            Margin="10 5 0 0"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Center"
                             IsEnabled="{Binding Editable}"
@@ -147,7 +148,7 @@
                         <TextBlock
                             Grid.Row="1"
                             Grid.Column="0"
-                            Margin="14,10,0,0"
+                            Margin="14 10 0 0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             FontSize="14"
@@ -159,7 +160,7 @@
                             LastChildFill="True">
                             <Button
                                 Name="btnBrowseFile"
-                                Margin="0,10,0,0"
+                                Margin="0 10 0 0"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Center"
                                 Click="btnBrowseFile_Click"
@@ -177,7 +178,7 @@
                             </Button>
                             <TextBox
                                 x:Name="PathTextBox"
-                                Margin="10,10,5,0"
+                                Margin="10 10 5 0"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Center"
                                 IsEnabled="{Binding Editable}"
@@ -187,19 +188,17 @@
                         <StackPanel
                             Grid.Row="2"
                             Grid.Column="1"
-                            Margin="14,10,14,0"
+                            Margin="14 10 14 0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             Orientation="Horizontal">
-                            <RadioButton IsChecked="{Binding OpenInTab}" 
-                                         Content="{DynamicResource defaultBrowser_newTab}"></RadioButton>
-                            <RadioButton IsChecked="{Binding OpenInNewWindow, Mode=OneTime}"
-                                         Content="{DynamicResource defaultBrowser_newWindow}"></RadioButton>
+                            <RadioButton Content="{DynamicResource defaultBrowser_newTab}" IsChecked="{Binding OpenInTab}" />
+                            <RadioButton Content="{DynamicResource defaultBrowser_newWindow}" IsChecked="{Binding OpenInNewWindow, Mode=OneTime}" />
                         </StackPanel>
                         <TextBlock
                             Grid.Row="3"
                             Grid.Column="0"
-                            Margin="14,10,0,20"
+                            Margin="14 10 0 20"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             FontSize="14"
@@ -207,17 +206,17 @@
                         <StackPanel
                             Grid.Row="3"
                             Grid.Column="1"
-                            Margin="0,10,0,15"
+                            Margin="0 10 0 15"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Center"
                             Orientation="Horizontal">
                             <TextBox
                                 x:Name="fileArgTextBox"
                                 Width="180"
-                                Margin="10,0,0,0"
+                                Margin="10 0 0 0"
                                 Text="{Binding PrivateArg}" />
                             <CheckBox
-                                Margin="12,0,0,0"
+                                Margin="12 0 0 0"
                                 VerticalAlignment="Center"
                                 IsChecked="{Binding EnablePrivate}">
                                 <CheckBox.Style>
@@ -239,18 +238,18 @@
             Grid.Row="1"
             Background="{DynamicResource PopupButtonAreaBGColor}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="0,1,0,0">
+            BorderThickness="0 1 0 0">
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnCancel"
                     Width="145"
-                    Margin="0,0,5,0"
+                    Margin="0 0 5 0"
                     Click="btnCancel_Click"
                     Content="{DynamicResource cancel}" />
                 <Button
                     x:Name="btnDone"
                     Width="145"
-                    Margin="5,0,0,0"
+                    Margin="5 0 0 0"
                     Click="btnDone_Click"
                     Content="{DynamicResource done}"
                     ForceCursor="True"
diff --git a/Flow.Launcher/SelectBrowserWindow.xaml.cs b/Flow.Launcher/SelectBrowserWindow.xaml.cs
index 4244d58278c..e8365819bd6 100644
--- a/Flow.Launcher/SelectBrowserWindow.xaml.cs
+++ b/Flow.Launcher/SelectBrowserWindow.xaml.cs
@@ -15,7 +15,22 @@ public partial class SelectBrowserWindow : Window, INotifyPropertyChanged
         public event PropertyChangedEventHandler PropertyChanged;
 
         public Settings Settings { get; }
-
+        public string SettingWindowFont
+        {
+            get => Settings.SettingWindowFont;
+            set
+            {
+                if (Settings.SettingWindowFont != value)
+                {
+                    Settings.SettingWindowFont = value;
+                    OnPropertyChanged(nameof(SettingWindowFont));
+                }
+            }
+        }
+        protected virtual void OnPropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
         public int SelectedCustomBrowserIndex
         {
             get => selectedCustomBrowserIndex; set
diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml b/Flow.Launcher/SelectFileManagerWindow.xaml
index 0287af9b03a..bfe6914e504 100644
--- a/Flow.Launcher/SelectFileManagerWindow.xaml
+++ b/Flow.Launcher/SelectFileManagerWindow.xaml
@@ -10,6 +10,7 @@
     Width="600"
     Background="{DynamicResource PopuBGColor}"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
+    FontFamily="{Binding SettingWindowFont, Mode=TwoWay}"
     Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
     SizeToContent="Height"
diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml.cs b/Flow.Launcher/SelectFileManagerWindow.xaml.cs
index b7bda45654a..80c0cf1f664 100644
--- a/Flow.Launcher/SelectFileManagerWindow.xaml.cs
+++ b/Flow.Launcher/SelectFileManagerWindow.xaml.cs
@@ -17,6 +17,22 @@ public partial class SelectFileManagerWindow : Window, INotifyPropertyChanged
 
         public Settings Settings { get; }
 
+        public string SettingWindowFont
+        {
+            get => Settings.SettingWindowFont;
+            set
+            {
+                if (Settings.SettingWindowFont != value)
+                {
+                    Settings.SettingWindowFont = value;
+                    OnPropertyChanged(nameof(SettingWindowFont));
+                }
+            }
+        }
+        protected virtual void OnPropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
         public int SelectedCustomExplorerIndex
         {
             get => selectedCustomExplorerIndex; set

From 9b52cb6a1029329d23f0964b13a0494d8849b71f Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 23 Apr 2025 11:53:54 +0900
Subject: [PATCH 07/12] Remove unused PropertyChanged event and
 OnPropertyChanged method from SettingWindowViewModel

---
 Flow.Launcher/ViewModel/SettingWindowViewModel.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index b6fd9555b17..4468b7865dc 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -58,11 +58,5 @@ public string SettingWindowFont
             }
         }
     }
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    protected virtual void OnPropertyChanged(string propertyName)
-    {
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-    }
+    
 }

From 284fe2b922e6145bbb14dc3960890338d6232f9c Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 23 Apr 2025 11:42:16 +0800
Subject: [PATCH 08/12] Cleanup codes

---
 Flow.Launcher/SettingWindow.xaml.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 70b5a22ede9..b4a3ae47a92 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -3,7 +3,6 @@
 using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Interop;
-using System.Windows.Media;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.UserSettings;

From 83e5654a5ce2a4651cdfb38f234d4b49bea2ccae Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 23 Apr 2025 11:42:55 +0800
Subject: [PATCH 09/12] Fix possible null exception

---
 Flow.Launcher/CustomShortcutSetting.xaml.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/CustomShortcutSetting.xaml.cs b/Flow.Launcher/CustomShortcutSetting.xaml.cs
index dcfa572f4c1..ba326fb9ee4 100644
--- a/Flow.Launcher/CustomShortcutSetting.xaml.cs
+++ b/Flow.Launcher/CustomShortcutSetting.xaml.cs
@@ -9,13 +9,14 @@ namespace Flow.Launcher
 {
     public partial class CustomShortcutSetting : Window
     {
+        private static readonly Settings _settings = Ioc.Default.GetRequiredService<Settings>();
+
         private readonly SettingsPaneHotkeyViewModel _hotkeyVm;
         public string Key { get; set; } = String.Empty;
         public string Value { get; set; } = String.Empty;
         private string originalKey { get; } = null;
         private string originalValue { get; } = null;
         private bool update { get; } = false;
-        private readonly Settings _settings;
         public event PropertyChangedEventHandler PropertyChanged;
         
         public string SettingWindowFont

From cdbe45d4dcf5e37e9810c755407560516a18e9f9 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 23 Apr 2025 11:48:11 +0800
Subject: [PATCH 10/12] Cleanup codes

---
 .../SettingPages/ViewModels/SettingsPaneAboutViewModel.cs      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
index 55d6b0a1c88..acffe1e85af 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
@@ -285,7 +285,6 @@ public string SettingWindowFont
     [RelayCommand]
     private void ResetSettingWindowFont()
     {
-        string defaultFont = Win32Helper.GetSystemDefaultFont(false);
-        SettingWindowFont = defaultFont;
+        SettingWindowFont = Win32Helper.GetSystemDefaultFont(false);
     }
 }

From c3509c3b20bcc4bc914d5ac39b678f0aef91f052 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 23 Apr 2025 12:43:34 +0800
Subject: [PATCH 11/12] Use property change event for settings & Use
 INotifyPropertyChanged instead

---
 .../UserSettings/Settings.cs                  | 15 ++++++-
 Flow.Launcher/CustomQueryHotkeySetting.xaml   |  2 +-
 .../CustomQueryHotkeySetting.xaml.cs          | 38 +++++-------------
 Flow.Launcher/CustomShortcutSetting.xaml      | 27 +++++++------
 Flow.Launcher/CustomShortcutSetting.xaml.cs   | 31 +++-----------
 Flow.Launcher/SelectBrowserWindow.xaml        |  2 +-
 Flow.Launcher/SelectBrowserWindow.xaml.cs     | 36 +++++------------
 Flow.Launcher/SelectFileManagerWindow.xaml    |  2 +-
 Flow.Launcher/SelectFileManagerWindow.xaml.cs | 38 +++++-------------
 .../SettingPages/Views/SettingsPaneAbout.xaml |  3 +-
 .../Views/SettingsPaneAbout.xaml.cs           | 22 +---------
 Flow.Launcher/SettingWindow.xaml              |  2 +-
 .../ViewModel/SettingWindowViewModel.cs       | 40 ++++++-------------
 13 files changed, 81 insertions(+), 177 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 52bc63ec61a..0f878151e72 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -96,7 +96,6 @@ public string Theme
         public string ResultSubFontStyle { get; set; }
         public string ResultSubFontWeight { get; set; }
         public string ResultSubFontStretch { get; set; }
-        public string SettingWindowFont { get; set; } = Win32Helper.GetSystemDefaultFont(false);
         public bool UseGlyphIcons { get; set; } = true;
         public bool UseAnimation { get; set; } = true;
         public bool UseSound { get; set; } = true;
@@ -104,6 +103,20 @@ public string Theme
         public bool ShowBadges { get; set; } = false;
         public bool ShowBadgesGlobalOnly { get; set; } = false;
 
+        private string _settingWindowFont { get; set; } = Win32Helper.GetSystemDefaultFont(false);
+        public string SettingWindowFont
+        {
+            get => _settingWindowFont;
+            set
+            {
+                if (_settingWindowFont != value)
+                {
+                    _settingWindowFont = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         public bool UseClock { get; set; } = true;
         public bool UseDate { get; set; } = false;
         public string TimeFormat { get; set; } = "hh:mm tt";
diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml
index a460ffae023..d3c31c6da5c 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml
@@ -4,11 +4,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:flowlauncher="clr-namespace:Flow.Launcher"
-    FontFamily="{Binding SettingWindowFont, Mode=TwoWay}"
     Title="{DynamicResource customeQueryHotkeyTitle}"
     Width="530"
     Background="{DynamicResource PopuBGColor}"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
+    FontFamily="{Binding Settings.SettingWindowFont, Mode=TwoWay}"
     Foreground="{DynamicResource PopupTextColor}"
     Icon="Images\app.png"
     MouseDown="window_MouseDown"
diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
index c377fb2502b..3c501d41a73 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
@@ -1,41 +1,23 @@
-using Flow.Launcher.Helper;
-using Flow.Launcher.Infrastructure.UserSettings;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Controls;
+using Flow.Launcher.Helper;
+using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher
 {
     public partial class CustomQueryHotkeySetting : Window
     {
-        private readonly Settings _settings;
+        public Settings Settings { get; set; }
+
         private bool update;
         private CustomPluginHotkey updateCustomHotkey;
-        public event PropertyChangedEventHandler PropertyChanged;
-        
-        public string SettingWindowFont
-        {
-            get => _settings.SettingWindowFont;
-            set
-            {
-                if (_settings.SettingWindowFont != value)
-                {
-                    _settings.SettingWindowFont = value;
-                    OnPropertyChanged(nameof(SettingWindowFont));
-                }
-            }
-        }
-        
-        protected virtual void OnPropertyChanged(string propertyName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
+
         public CustomQueryHotkeySetting(Settings settings)
         {
-            _settings = settings;
+            Settings = settings;
             InitializeComponent();
         }
 
@@ -48,13 +30,13 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)
         {
             if (!update)
             {
-                _settings.CustomPluginHotkeys ??= new ObservableCollection<CustomPluginHotkey>();
+                Settings.CustomPluginHotkeys ??= new ObservableCollection<CustomPluginHotkey>();
 
                 var pluginHotkey = new CustomPluginHotkey
                 {
                     Hotkey = HotkeyControl.CurrentHotkey.ToString(), ActionKeyword = tbAction.Text
                 };
-                _settings.CustomPluginHotkeys.Add(pluginHotkey);
+                Settings.CustomPluginHotkeys.Add(pluginHotkey);
 
                 HotKeyMapper.SetCustomQueryHotkey(pluginHotkey);
             }
@@ -73,7 +55,7 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)
 
         public void UpdateItem(CustomPluginHotkey item)
         {
-            updateCustomHotkey = _settings.CustomPluginHotkeys.FirstOrDefault(o =>
+            updateCustomHotkey = Settings.CustomPluginHotkeys.FirstOrDefault(o =>
                 o.ActionKeyword == item.ActionKeyword && o.Hotkey == item.Hotkey);
             if (updateCustomHotkey == null)
             {
diff --git a/Flow.Launcher/CustomShortcutSetting.xaml b/Flow.Launcher/CustomShortcutSetting.xaml
index 9256a2c5299..cbdcecea6a9 100644
--- a/Flow.Launcher/CustomShortcutSetting.xaml
+++ b/Flow.Launcher/CustomShortcutSetting.xaml
@@ -7,6 +7,7 @@
     Width="530"
     Background="{DynamicResource PopuBGColor}"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
+    FontFamily="{Binding Settings.SettingWindowFont, Mode=TwoWay}"
     Foreground="{DynamicResource PopupTextColor}"
     Icon="Images\app.png"
     ResizeMode="NoResize"
@@ -56,11 +57,11 @@
                     </Button>
                 </Grid>
             </StackPanel>
-            <StackPanel Margin="26,0,26,0">
-                <StackPanel Grid.Row="0" Margin="0,0,0,12">
+            <StackPanel Margin="26 0 26 0">
+                <StackPanel Grid.Row="0" Margin="0 0 0 12">
                     <TextBlock
                         Grid.Column="0"
-                        Margin="0,0,0,0"
+                        Margin="0 0 0 0"
                         FontSize="20"
                         FontWeight="SemiBold"
                         Text="{DynamicResource customQueryShortcut}"
@@ -73,18 +74,18 @@
                         TextAlignment="Left"
                         TextWrapping="WrapWithOverflow" />
                     <TextBlock
-                        Margin="0,20,0,0"
+                        Margin="0 20 0 0"
                         FontSize="14"
                         Text="{DynamicResource customeQueryShortcutGuide}"
                         TextAlignment="Left"
                         TextWrapping="WrapWithOverflow" />
                     <Image
                         Width="478"
-                        Margin="0,20,0,0"
+                        Margin="0 20 0 0"
                         Source="/Images/illustration_02.png" />
                 </StackPanel>
 
-                <StackPanel Margin="0,10,0,10" Orientation="Horizontal">
+                <StackPanel Margin="0 10 0 10" Orientation="Horizontal">
                     <Grid Width="478">
                         <Grid.RowDefinitions>
                             <RowDefinition />
@@ -124,14 +125,14 @@
                             LastChildFill="True">
                             <Button
                                 x:Name="btnTestShortcut"
-                                Margin="0,0,10,0"
-                                Padding="10,5,10,5"
+                                Margin="0 0 10 0"
+                                Padding="10 5 10 5"
                                 Click="BtnTestShortcut_OnClick"
                                 Content="{DynamicResource preview}"
                                 DockPanel.Dock="Right" />
                             <TextBox
                                 x:Name="tbExpand"
-                                Margin="10,0,10,0"
+                                Margin="10 0 10 0"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Center"
                                 Text="{Binding Value}" />
@@ -142,21 +143,21 @@
         </StackPanel>
         <Border
             Grid.Row="1"
-            Margin="0,10,0,0"
+            Margin="0 10 0 0"
             Background="{DynamicResource PopupButtonAreaBGColor}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="0,1,0,0">
+            BorderThickness="0 1 0 0">
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnCancel"
                     MinWidth="140"
-                    Margin="10,0,5,0"
+                    Margin="10 0 5 0"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
                 <Button
                     x:Name="btnAdd"
                     MinWidth="140"
-                    Margin="5,0,10,0"
+                    Margin="5 0 10 0"
                     Click="BtnAdd_OnClick"
                     Style="{StaticResource AccentButtonStyle}">
                     <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
diff --git a/Flow.Launcher/CustomShortcutSetting.xaml.cs b/Flow.Launcher/CustomShortcutSetting.xaml.cs
index ba326fb9ee4..183cc3a7ff6 100644
--- a/Flow.Launcher/CustomShortcutSetting.xaml.cs
+++ b/Flow.Launcher/CustomShortcutSetting.xaml.cs
@@ -1,7 +1,6 @@
-using System;
-using System.ComponentModel;
-using System.Windows;
+using System.Windows;
 using System.Windows.Input;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.SettingPages.ViewModels;
 
@@ -9,33 +8,15 @@ namespace Flow.Launcher
 {
     public partial class CustomShortcutSetting : Window
     {
-        private static readonly Settings _settings = Ioc.Default.GetRequiredService<Settings>();
+        public Settings Settings { get; set; } = Ioc.Default.GetRequiredService<Settings>();
 
         private readonly SettingsPaneHotkeyViewModel _hotkeyVm;
-        public string Key { get; set; } = String.Empty;
-        public string Value { get; set; } = String.Empty;
+        public string Key { get; set; } = string.Empty;
+        public string Value { get; set; } = string.Empty;
         private string originalKey { get; } = null;
         private string originalValue { get; } = null;
         private bool update { get; } = false;
-        public event PropertyChangedEventHandler PropertyChanged;
-        
-        public string SettingWindowFont
-        {
-            get => _settings.SettingWindowFont;
-            set
-            {
-                if (_settings.SettingWindowFont != value)
-                {
-                    _settings.SettingWindowFont = value;
-                    OnPropertyChanged(nameof(SettingWindowFont));
-                }
-            }
-        }
-        
-        protected virtual void OnPropertyChanged(string propertyName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
+
         public CustomShortcutSetting(SettingsPaneHotkeyViewModel vm)
         {
             _hotkeyVm = vm;
diff --git a/Flow.Launcher/SelectBrowserWindow.xaml b/Flow.Launcher/SelectBrowserWindow.xaml
index b16de277048..4fc5a91c5da 100644
--- a/Flow.Launcher/SelectBrowserWindow.xaml
+++ b/Flow.Launcher/SelectBrowserWindow.xaml
@@ -10,7 +10,7 @@
     Width="550"
     Background="{DynamicResource PopuBGColor}"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
-    FontFamily="{Binding SettingWindowFont, Mode=TwoWay}"
+    FontFamily="{Binding Settings.SettingWindowFont, Mode=TwoWay}"
     Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
     SizeToContent="Height"
diff --git a/Flow.Launcher/SelectBrowserWindow.xaml.cs b/Flow.Launcher/SelectBrowserWindow.xaml.cs
index e8365819bd6..849056ab104 100644
--- a/Flow.Launcher/SelectBrowserWindow.xaml.cs
+++ b/Flow.Launcher/SelectBrowserWindow.xaml.cs
@@ -1,42 +1,25 @@
-using Flow.Launcher.Infrastructure.UserSettings;
-using System;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher
 {
-    public partial class SelectBrowserWindow : Window, INotifyPropertyChanged
+    [INotifyPropertyChanged]
+    public partial class SelectBrowserWindow : Window
     {
-        private int selectedCustomBrowserIndex;
+        public Settings Settings { get; }
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        private int selectedCustomBrowserIndex;
 
-        public Settings Settings { get; }
-        public string SettingWindowFont
-        {
-            get => Settings.SettingWindowFont;
-            set
-            {
-                if (Settings.SettingWindowFont != value)
-                {
-                    Settings.SettingWindowFont = value;
-                    OnPropertyChanged(nameof(SettingWindowFont));
-                }
-            }
-        }
-        protected virtual void OnPropertyChanged(string propertyName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
         public int SelectedCustomBrowserIndex
         {
             get => selectedCustomBrowserIndex; set
             {
                 selectedCustomBrowserIndex = value;
-                PropertyChanged?.Invoke(this, new(nameof(CustomBrowser)));
+                OnPropertyChanged(nameof(CustomBrowser));
             }
         }
         public ObservableCollection<CustomBrowserViewModel> CustomBrowsers { get; set; }
@@ -79,8 +62,7 @@ private void btnDelete_Click(object sender, RoutedEventArgs e)
         private void btnBrowseFile_Click(object sender, RoutedEventArgs e)
         {
             Microsoft.Win32.OpenFileDialog dlg = new Microsoft.Win32.OpenFileDialog();
-            Nullable<bool> result = dlg.ShowDialog();
-
+            var result = dlg.ShowDialog();
             if (result == true)
             {
                 TextBox path = (TextBox)(((FrameworkElement)sender).Parent as FrameworkElement).FindName("PathTextBox");
diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml b/Flow.Launcher/SelectFileManagerWindow.xaml
index bfe6914e504..7d1fe0f567f 100644
--- a/Flow.Launcher/SelectFileManagerWindow.xaml
+++ b/Flow.Launcher/SelectFileManagerWindow.xaml
@@ -10,7 +10,7 @@
     Width="600"
     Background="{DynamicResource PopuBGColor}"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
-    FontFamily="{Binding SettingWindowFont, Mode=TwoWay}"
+    FontFamily="{Binding Settings.SettingWindowFont, Mode=TwoWay}"
     Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
     SizeToContent="Height"
diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml.cs b/Flow.Launcher/SelectFileManagerWindow.xaml.cs
index 80c0cf1f664..946052e320b 100644
--- a/Flow.Launcher/SelectFileManagerWindow.xaml.cs
+++ b/Flow.Launcher/SelectFileManagerWindow.xaml.cs
@@ -1,44 +1,27 @@
-using Flow.Launcher.Infrastructure.UserSettings;
-using Flow.Launcher.ViewModel;
-using System;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Flow.Launcher.Infrastructure.UserSettings;
+using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher
 {
-    public partial class SelectFileManagerWindow : Window, INotifyPropertyChanged
+    [INotifyPropertyChanged]
+    public partial class SelectFileManagerWindow : Window
     {
-        private int selectedCustomExplorerIndex;
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
         public Settings Settings { get; }
 
-        public string SettingWindowFont
-        {
-            get => Settings.SettingWindowFont;
-            set
-            {
-                if (Settings.SettingWindowFont != value)
-                {
-                    Settings.SettingWindowFont = value;
-                    OnPropertyChanged(nameof(SettingWindowFont));
-                }
-            }
-        }
-        protected virtual void OnPropertyChanged(string propertyName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
+        private int selectedCustomExplorerIndex;
+
         public int SelectedCustomExplorerIndex
         {
             get => selectedCustomExplorerIndex; set
             {
                 selectedCustomExplorerIndex = value;
-                PropertyChanged?.Invoke(this, new(nameof(CustomExplorer)));
+                OnPropertyChanged(nameof(CustomExplorer));
             }
         }
         public ObservableCollection<CustomExplorerViewModel> CustomExplorers { get; set; }
@@ -81,8 +64,7 @@ private void btnDelete_Click(object sender, RoutedEventArgs e)
         private void btnBrowseFile_Click(object sender, RoutedEventArgs e)
         {
             Microsoft.Win32.OpenFileDialog dlg = new Microsoft.Win32.OpenFileDialog();
-            Nullable<bool> result = dlg.ShowDialog();
-
+            var result = dlg.ShowDialog();
             if (result == true)
             {
                 TextBox path = (TextBox)(((FrameworkElement)sender).Parent as FrameworkElement).FindName("PathTextBox");
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
index 44a0490ca19..4bf5df227e5 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
@@ -160,8 +160,7 @@
                                 DisplayMemberPath="Source"
                                 ItemsSource="{Binding Source={StaticResource SortedFonts}}"
                                 SelectedValue="{Binding SettingWindowFont, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                SelectedValuePath="Source"
-                                SelectionChanged="SettingWindowFontComboBox_SelectionChanged" />
+                                SelectedValuePath="Source" />
                         </StackPanel>
                     </cc:Card>
                 </StackPanel>
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs
index cedc196333d..1ecc02aa6b3 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs
@@ -1,7 +1,4 @@
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.Windows.Navigation;
+using System.Windows.Navigation;
 using Flow.Launcher.Core;
 using Flow.Launcher.SettingPages.ViewModels;
 using Flow.Launcher.Infrastructure.UserSettings;
@@ -31,21 +28,4 @@ private void OnRequestNavigate(object sender, RequestNavigateEventArgs e)
         App.API.OpenUrl(e.Uri.AbsoluteUri);
         e.Handled = true;
     }
-    
-    private void SettingWindowFontComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
-    {
-        if (sender is ComboBox comboBox && comboBox.SelectedItem is FontFamily selectedFont)
-        {
-            if (DataContext is SettingsPaneAboutViewModel viewModel)
-            {
-                viewModel.SettingWindowFont = selectedFont.Source;
-            
-                // 설정 창 글꼴 즉시 업데이트
-                if (Window.GetWindow(this) is SettingWindow settingWindow)
-                {
-                    settingWindow.FontFamily = selectedFont;
-                }
-            }
-        }
-    }
 }
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index f2cf9fab23f..a34777d3020 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -13,7 +13,7 @@
     MinHeight="600"
     d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}"
     Closed="OnClosed"
-    FontFamily="{Binding SettingWindowFont, Mode=TwoWay}"
+    FontFamily="{Binding Settings.SettingWindowFont, Mode=TwoWay}"
     Icon="Images\app.ico"
     Left="{Binding SettingWindowLeft, Mode=TwoWay}"
     Loaded="OnLoaded"
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 4468b7865dc..19edba4d942 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -1,17 +1,15 @@
-using System.ComponentModel;
-using System.Windows.Media;
-using Flow.Launcher.Infrastructure.UserSettings;
+using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 
 namespace Flow.Launcher.ViewModel;
 
 public partial class SettingWindowViewModel : BaseModel
 {
-    private readonly Settings _settings;
+    public Settings Settings { get; set; }
 
     public SettingWindowViewModel(Settings settings)
     {
-        _settings = settings;
+        Settings = settings;
     }
 
     /// <summary>
@@ -19,44 +17,30 @@ public SettingWindowViewModel(Settings settings)
     /// </summary>
     public void Save()
     {
-        _settings.Save();
+        Settings.Save();
     }
 
     public double SettingWindowWidth
     {
-        get => _settings.SettingWindowWidth;
-        set => _settings.SettingWindowWidth = value;
+        get => Settings.SettingWindowWidth;
+        set => Settings.SettingWindowWidth = value;
     }
 
     public double SettingWindowHeight
     {
-        get => _settings.SettingWindowHeight;
-        set => _settings.SettingWindowHeight = value;
+        get => Settings.SettingWindowHeight;
+        set => Settings.SettingWindowHeight = value;
     }
 
     public double? SettingWindowTop
     {
-        get => _settings.SettingWindowTop;
-        set => _settings.SettingWindowTop = value;
+        get => Settings.SettingWindowTop;
+        set => Settings.SettingWindowTop = value;
     }
 
     public double? SettingWindowLeft
     {
-        get => _settings.SettingWindowLeft;
-        set => _settings.SettingWindowLeft = value;
+        get => Settings.SettingWindowLeft;
+        set => Settings.SettingWindowLeft = value;
     }
-
-    public string SettingWindowFont
-    {
-        get => _settings.SettingWindowFont;
-        set
-        {
-            if (_settings.SettingWindowFont != value)
-            {
-                _settings.SettingWindowFont = value;
-                OnPropertyChanged(nameof(SettingWindowFont));
-            }
-        }
-    }
-    
 }

From f4f8e9af5247c2004e6771236784ebe2e5e13b61 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 23 Apr 2025 12:49:36 +0800
Subject: [PATCH 12/12] Make settings readonly

---
 Flow.Launcher/CustomQueryHotkeySetting.xaml.cs    | 2 +-
 Flow.Launcher/CustomShortcutSetting.xaml.cs       | 2 +-
 Flow.Launcher/ViewModel/SettingWindowViewModel.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
index 3c501d41a73..cc07caaa21e 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
@@ -10,7 +10,7 @@ namespace Flow.Launcher
 {
     public partial class CustomQueryHotkeySetting : Window
     {
-        public Settings Settings { get; set; }
+        public Settings Settings { get; }
 
         private bool update;
         private CustomPluginHotkey updateCustomHotkey;
diff --git a/Flow.Launcher/CustomShortcutSetting.xaml.cs b/Flow.Launcher/CustomShortcutSetting.xaml.cs
index 183cc3a7ff6..fcee0c96196 100644
--- a/Flow.Launcher/CustomShortcutSetting.xaml.cs
+++ b/Flow.Launcher/CustomShortcutSetting.xaml.cs
@@ -8,7 +8,7 @@ namespace Flow.Launcher
 {
     public partial class CustomShortcutSetting : Window
     {
-        public Settings Settings { get; set; } = Ioc.Default.GetRequiredService<Settings>();
+        public Settings Settings { get; } = Ioc.Default.GetRequiredService<Settings>();
 
         private readonly SettingsPaneHotkeyViewModel _hotkeyVm;
         public string Key { get; set; } = string.Empty;
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 19edba4d942..f05893cf476 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -5,7 +5,7 @@ namespace Flow.Launcher.ViewModel;
 
 public partial class SettingWindowViewModel : BaseModel
 {
-    public Settings Settings { get; set; }
+    public Settings Settings { get; }
 
     public SettingWindowViewModel(Settings settings)
     {