From 2d1e9ecd3bef4a336d34ccee48d45b8ec0f1c660 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 24 Apr 2025 19:06:24 +0900
Subject: [PATCH] Add ContentControlThemeFontFamily to support dynamic font
 styling

---
 Flow.Launcher/App.xaml.cs                          | 1 +
 Flow.Launcher/Resources/CustomControlTemplate.xaml | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 606536dad..6a7b892be 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -177,6 +177,7 @@ namespace Flow.Launcher
 
                 _mainWindow = new MainWindow();
                 Current.Resources["SettingWindowFont"] = new FontFamily(_settings.SettingWindowFont);
+                Current.Resources["ContentControlThemeFontFamily"] = new FontFamily(_settings.SettingWindowFont);
 
                 API.LogInfo(ClassName, "Dependencies Info:{ErrorReporting.DependenciesInfo()}");
 
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 10d8fb6e7..0e101a0fe 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -18,6 +18,9 @@
     <Style TargetType="Window">
         <Setter Property="FontFamily" Value="{DynamicResource SettingWindowFont}" />
     </Style>
+    <FontFamily x:Key="ContentControlThemeFontFamily">
+        {DynamicResource SettingWindowFont}
+    </FontFamily>
 
     <ContextMenu x:Key="TextBoxContextMenu">
         <MenuItem Command="ApplicationCommands.Cut" Header="{DynamicResource cut}">
@@ -1360,7 +1363,6 @@
         <Setter Property="SelectionBrush" Value="{DynamicResource TextControlSelectionHighlightColor}" />
         <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
-        <Setter Property="FontFamily" Value="{DynamicResource SettingWindowFont}" />
         <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
@@ -1584,6 +1586,7 @@
 
     <Style BasedOn="{StaticResource DefaultPasswordBoxStyle}" TargetType="PasswordBox">
         <Setter Property="ContextMenu" Value="{StaticResource TextBoxContextMenu}" />
+        <Setter Property="FontFamily" Value="{DynamicResource SettingWindowFont}" />
     </Style>
 
     <Style
@@ -2744,6 +2747,7 @@
                             Margin="{TemplateBinding BorderThickness}"
                             Padding="{TemplateBinding Padding}"
                             Focusable="False"
+                            FontFamily="{DynamicResource ContentControlThemeFontFamily}"
                             HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                             IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
                             IsTabStop="False"
@@ -2756,6 +2760,7 @@
                             Grid.ColumnSpan="2"
                             Margin="{TemplateBinding BorderThickness}"
                             Padding="{TemplateBinding Padding}"
+                            FontFamily="{DynamicResource ContentControlThemeFontFamily}"
                             Foreground="{TemplateBinding ui:ControlHelper.PlaceholderForeground}"
                             IsHitTestVisible="False"
                             Text="{TemplateBinding ui:ControlHelper.PlaceholderText}"