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] 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 0171e6d79..a460ffae0 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 8b193fa1d..c377fb250 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 @@ namespace Flow.Launcher
         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 ecbdea606..dcfa572f4 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 @@ namespace Flow.Launcher
         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 c12879a04..b16de2770 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 4244d5827..e8365819b 100644
--- a/Flow.Launcher/SelectBrowserWindow.xaml.cs
+++ b/Flow.Launcher/SelectBrowserWindow.xaml.cs
@@ -15,7 +15,22 @@ namespace Flow.Launcher
         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 0287af9b0..bfe6914e5 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 b7bda4565..80c0cf1f6 100644
--- a/Flow.Launcher/SelectFileManagerWindow.xaml.cs
+++ b/Flow.Launcher/SelectFileManagerWindow.xaml.cs
@@ -17,6 +17,22 @@ namespace Flow.Launcher
 
         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