- Fixed an issue where font settings were not applied when using the Blur theme

onesounds · onesounds · commit a07877760828 · 2025-03-24T18:10:12.000+09:00
- Removed bold style from highlight and delegated it to individual themes
diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
@@ -72,7 +72,7 @@ public Theme(IPublicAPI publicAPI, Settings settings)
             }
             else
             {
-                Log.Error("현재 테마 리소스를 찾을 수 없습니다. 기본 테마로 초기화합니다.");
+                Log.Error("Current theme resource not found. Initializing with default theme.");
                 _oldTheme = Constant.DefaultTheme;
             };
             _oldTheme = Path.GetFileNameWithoutExtension(_oldResource.Source.AbsolutePath);
@@ -104,26 +104,149 @@ private void MakeSureThemeDirectoriesExist()
 
         private void UpdateResourceDictionary(ResourceDictionary dictionaryToUpdate)
         {
-            // 새 테마 리소스를 먼저 추가하고
+            // Add the new theme resource first
             if (!Application.Current.Resources.MergedDictionaries.Contains(dictionaryToUpdate))
             {
                 Application.Current.Resources.MergedDictionaries.Add(dictionaryToUpdate);
             }
     
-            // 그 다음 이전 테마 리소스 제거
+            // Then remove the old theme resource
             if (_oldResource != null && 
                 _oldResource != dictionaryToUpdate && 
                 Application.Current.Resources.MergedDictionaries.Contains(_oldResource))
             {
                 Application.Current.Resources.MergedDictionaries.Remove(_oldResource);
             }
-    
             _oldResource = dictionaryToUpdate;
-    
-            // 리소스 변경 후 문제가 없는지 검증
-            Debug.WriteLine($"테마 변경 후 리소스 딕셔너리 수: {Application.Current.Resources.MergedDictionaries.Count}");
         }
 
+        /// <summary>
+        /// Updates only the font settings and refreshes the UI.
+        /// </summary>
+        public void UpdateFonts()
+        {
+            try
+            {
+                // Loads a ResourceDictionary for the specified theme.
+                var themeName = GetCurrentTheme();
+                var dict = GetThemeResourceDictionary(themeName);
+                
+                // Applies font settings to the theme resource.
+                ApplyFontSettings(dict);
+                UpdateResourceDictionary(dict);
+                _ = RefreshFrameAsync();
+            }
+            catch (Exception e)
+            {
+                Log.Exception("Error occurred while updating theme fonts", e);
+            }
+        }
+
+        /// <summary>
+        /// Loads and applies font settings to the theme resource.
+        /// </summary>
+        private void ApplyFontSettings(ResourceDictionary dict)
+        {
+            if (dict["QueryBoxStyle"] is Style queryBoxStyle &&
+                dict["QuerySuggestionBoxStyle"] is Style querySuggestionBoxStyle)
+            {
+                var fontFamily = new FontFamily(_settings.QueryBoxFont);
+                var fontStyle = FontHelper.GetFontStyleFromInvariantStringOrNormal(_settings.QueryBoxFontStyle);
+                var fontWeight = FontHelper.GetFontWeightFromInvariantStringOrNormal(_settings.QueryBoxFontWeight);
+                var fontStretch = FontHelper.GetFontStretchFromInvariantStringOrNormal(_settings.QueryBoxFontStretch);
+                
+                SetFontProperties(queryBoxStyle, fontFamily, fontStyle, fontWeight, fontStretch, true);
+                SetFontProperties(querySuggestionBoxStyle, fontFamily, fontStyle, fontWeight, fontStretch, false);
+            }
+            
+            if (dict["ItemTitleStyle"] is Style resultItemStyle &&
+                dict["ItemTitleSelectedStyle"] is Style resultItemSelectedStyle &&
+                dict["ItemHotkeyStyle"] is Style resultHotkeyItemStyle &&
+                dict["ItemHotkeySelectedStyle"] is Style resultHotkeyItemSelectedStyle)
+            {
+                var fontFamily = new FontFamily(_settings.ResultFont);
+                var fontStyle = FontHelper.GetFontStyleFromInvariantStringOrNormal(_settings.ResultFontStyle);
+                var fontWeight = FontHelper.GetFontWeightFromInvariantStringOrNormal(_settings.ResultFontWeight);
+                var fontStretch = FontHelper.GetFontStretchFromInvariantStringOrNormal(_settings.ResultFontStretch);
+
+                SetFontProperties(resultItemStyle, fontFamily, fontStyle, fontWeight, fontStretch, false);
+                SetFontProperties(resultItemSelectedStyle, fontFamily, fontStyle, fontWeight, fontStretch, false);
+                SetFontProperties(resultHotkeyItemStyle, fontFamily, fontStyle, fontWeight, fontStretch, false);
+                SetFontProperties(resultHotkeyItemSelectedStyle, fontFamily, fontStyle, fontWeight, fontStretch, false);
+            }
+            
+            if (dict["ItemSubTitleStyle"] is Style resultSubItemStyle &&
+                dict["ItemSubTitleSelectedStyle"] is Style resultSubItemSelectedStyle)
+            {
+                var fontFamily = new FontFamily(_settings.ResultSubFont);
+                var fontStyle = FontHelper.GetFontStyleFromInvariantStringOrNormal(_settings.ResultSubFontStyle);
+                var fontWeight = FontHelper.GetFontWeightFromInvariantStringOrNormal(_settings.ResultSubFontWeight);
+                var fontStretch = FontHelper.GetFontStretchFromInvariantStringOrNormal(_settings.ResultSubFontStretch);
+
+                SetFontProperties(resultSubItemStyle, fontFamily, fontStyle, fontWeight, fontStretch, false);
+                SetFontProperties(resultSubItemSelectedStyle, fontFamily, fontStyle, fontWeight, fontStretch, false);
+            }
+        }
+
+        /// <summary>
+        /// Applies font properties to a Style.
+        /// </summary>
+        private void SetFontProperties(Style style, FontFamily fontFamily, FontStyle fontStyle, FontWeight fontWeight, FontStretch fontStretch, bool isTextBox)
+        {
+            // Remove existing font-related setters  
+            if (isTextBox)
+            {
+                //  First, find the setters to remove and store them in a list  
+                var settersToRemove = style.Setters
+                    .OfType<Setter>()
+                    .Where(setter => 
+                        setter.Property == TextBox.FontFamilyProperty ||
+                        setter.Property == TextBox.FontStyleProperty ||
+                        setter.Property == TextBox.FontWeightProperty ||
+                        setter.Property == TextBox.FontStretchProperty)
+                    .ToList();
+
+                // Remove each found setter one by one  
+                foreach (var setter in settersToRemove)
+                {
+                    style.Setters.Remove(setter);
+                }
+
+                // Add New font setter
+                style.Setters.Add(new Setter(TextBox.FontFamilyProperty, fontFamily));
+                style.Setters.Add(new Setter(TextBox.FontStyleProperty, fontStyle));
+                style.Setters.Add(new Setter(TextBox.FontWeightProperty, fontWeight));
+                style.Setters.Add(new Setter(TextBox.FontStretchProperty, fontStretch));
+
+                //  Set caret brush (retain existing logic)
+                var caretBrushPropertyValue = style.Setters.OfType<Setter>().Any(x => x.Property.Name == "CaretBrush");
+                var foregroundPropertyValue = style.Setters.OfType<Setter>().Where(x => x.Property.Name == "Foreground")
+                    .Select(x => x.Value).FirstOrDefault();
+                if (!caretBrushPropertyValue && foregroundPropertyValue != null)
+                    style.Setters.Add(new Setter(TextBox.CaretBrushProperty, foregroundPropertyValue));
+            }
+            else
+            {
+                var settersToRemove = style.Setters
+                    .OfType<Setter>()
+                    .Where(setter => 
+                        setter.Property == TextBlock.FontFamilyProperty ||
+                        setter.Property == TextBlock.FontStyleProperty ||
+                        setter.Property == TextBlock.FontWeightProperty ||
+                        setter.Property == TextBlock.FontStretchProperty)
+                    .ToList();
+                
+                foreach (var setter in settersToRemove)
+                {
+                    style.Setters.Remove(setter);
+                }
+                
+                style.Setters.Add(new Setter(TextBlock.FontFamilyProperty, fontFamily));
+                style.Setters.Add(new Setter(TextBlock.FontStyleProperty, fontStyle));
+                style.Setters.Add(new Setter(TextBlock.FontWeightProperty, fontWeight));
+                style.Setters.Add(new Setter(TextBlock.FontStretchProperty, fontStretch));
+            }
+        }
         private ResourceDictionary GetThemeResourceDictionary(string theme)
         {
             var uri = GetThemePath(theme);
@@ -286,9 +409,10 @@ public bool ChangeTheme(string theme = null)
                 if (string.IsNullOrEmpty(path))
                     throw new DirectoryNotFoundException("Theme path can't be found <{path}>");
 
-                // reload all resources even if the theme itself hasn't changed in order to pickup changes
-                // to things like fonts
-                UpdateResourceDictionary(GetResourceDictionary(theme));
+                // Retrieve theme resource – always use the resource with font settings applied.
+                var resourceDict = GetResourceDictionary(theme);
+                
+                UpdateResourceDictionary(resourceDict);
 
                 _settings.Theme = theme;
 
@@ -299,10 +423,11 @@ public bool ChangeTheme(string theme = null)
                 }
 
                 BlurEnabled = IsBlurTheme();
-                //if (_settings.UseDropShadowEffect)
-                // AddDropShadowEffectToCurrentTheme();
-                //Win32Helper.SetBlurForWindow(Application.Current.MainWindow, BlurEnabled);
-                _ = SetBlurForWindowAsync();
+
+                // 블러 및 그림자 효과 적용을 위한 비동기 처리
+                _ = RefreshFrameAsync();
+        
+                return true;
             }
             catch (DirectoryNotFoundException)
             {
@@ -324,7 +449,6 @@ public bool ChangeTheme(string theme = null)
                 }
                 return false;
             }
-            return true;
         }
 
         #endregion
@@ -500,7 +624,7 @@ await Application.Current.Dispatcher.InvokeAsync(() =>
 
         private void SetBlurForWindow(string theme, BackdropTypes backdropType)
         {
-            var dict = GetThemeResourceDictionary(theme);
+            var dict = GetResourceDictionary(theme);  // GetThemeResourceDictionary 대신 GetResourceDictionary 사용
             if (dict == null)
                 return;
 
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
@@ -342,7 +342,7 @@ public FontFamily SelectedQueryBoxFont
         set
         {
             Settings.QueryBoxFont = value.ToString();
-            _theme.ChangeTheme();
+            _theme.UpdateFonts(); 
         }
     }
 
@@ -364,7 +364,7 @@ public FamilyTypeface SelectedQueryBoxFontFaces
             Settings.QueryBoxFontStretch = value.Stretch.ToString();
             Settings.QueryBoxFontWeight = value.Weight.ToString();
             Settings.QueryBoxFontStyle = value.Style.ToString();
-            _theme.ChangeTheme();
+            _theme.UpdateFonts(); 
         }
     }
 
@@ -386,7 +386,7 @@ public FontFamily SelectedResultFont
         set
         {
             Settings.ResultFont = value.ToString();
-            _theme.ChangeTheme();
+            _theme.UpdateFonts(); 
         }
     }
 
@@ -408,7 +408,7 @@ public FamilyTypeface SelectedResultFontFaces
             Settings.ResultFontStretch = value.Stretch.ToString();
             Settings.ResultFontWeight = value.Weight.ToString();
             Settings.ResultFontStyle = value.Style.ToString();
-            _theme.ChangeTheme();
+            _theme.UpdateFonts(); 
         }
     }
 
@@ -432,7 +432,7 @@ public FontFamily SelectedResultSubFont
         set
         {
             Settings.ResultSubFont = value.ToString();
-            _theme.ChangeTheme();
+            _theme.UpdateFonts(); 
         }
     }
 
@@ -453,7 +453,7 @@ public FamilyTypeface SelectedResultSubFontFaces
             Settings.ResultSubFontStretch = value.Stretch.ToString();
             Settings.ResultSubFontWeight = value.Weight.ToString();
             Settings.ResultSubFontStyle = value.Style.ToString();
-            _theme.ChangeTheme();
+            _theme.UpdateFonts(); 
         }
     }
 
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
@@ -27,7 +27,6 @@
     <Style x:Key="BaseQueryBoxStyle" TargetType="{x:Type TextBox}">
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="FontSize" Value="28" />
-        <Setter Property="FontWeight" Value="Regular" />
         <Setter Property="Margin" Value="16 7 0 7" />
         <Setter Property="Padding" Value="0 0 68 0" />
         <Setter Property="Background" Value="Transparent" />
@@ -181,12 +180,10 @@
     <Style x:Key="BaseItemTitleStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#FFFFF8" />
         <Setter Property="FontSize" Value="16" />
-        <Setter Property="FontWeight" Value="Medium" />
     </Style>
     <Style x:Key="BaseItemSubTitleStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#D9D9D4" />
         <Setter Property="FontSize" Value="13" />
-        <Setter Property="FontWeight" Value="Normal" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding ElementName=SubTitle, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0">
                 <Setter Property="Height" Value="0" />
@@ -218,7 +215,6 @@
     <Style x:Key="BaseItemTitleSelectedStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#FFFFF8" />
         <Setter Property="FontSize" Value="16" />
-        <Setter Property="FontWeight" Value="Normal" />
     </Style>
     <Style x:Key="BaseItemSubTitleSelectedStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#D9D9D4" />
@@ -352,7 +348,6 @@
     </Style>
     <Style x:Key="BaseSeparatorStyle" TargetType="Rectangle" />
     <Style x:Key="HighlightStyle">
-        <Setter Property="Inline.FontWeight" Value="Bold" />
     </Style>
     <Style x:Key="BaseItemHotkeyStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="15" />
diff --git a/Flow.Launcher/Themes/BlurBlack Darker.xaml b/Flow.Launcher/Themes/BlurBlack Darker.xaml
@@ -54,7 +54,9 @@
             </Setter.Value>
         </Setter>
     </Style>
-
+    <Style x:Key="HighlightStyle">
+        <Setter Property="Inline.FontWeight" Value="Bold" />
+    </Style>
     <Style
         x:Key="SeparatorStyle"
         BasedOn="{StaticResource BaseSeparatorStyle}"
diff --git a/Flow.Launcher/Themes/BlurBlack.xaml b/Flow.Launcher/Themes/BlurBlack.xaml
@@ -52,7 +52,9 @@
             </Setter.Value>
         </Setter>
     </Style>
-
+    <Style x:Key="HighlightStyle">
+        <Setter Property="Inline.FontWeight" Value="Bold" />
+    </Style>
     <Style
         x:Key="SeparatorStyle"
         BasedOn="{StaticResource BaseSeparatorStyle}"
diff --git a/Flow.Launcher/Themes/BlurWhite.xaml b/Flow.Launcher/Themes/BlurWhite.xaml
@@ -60,7 +60,9 @@
         <Setter Property="BorderBrush" Value="#aaaaaa" />
         <Setter Property="CornerRadius" Value="0" />
     </Style>
-
+    <Style x:Key="HighlightStyle">
+        <Setter Property="Inline.FontWeight" Value="Bold" />
+    </Style>
     <Style
         x:Key="WindowStyle"
         BasedOn="{StaticResource BaseWindowStyle}"

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ public FontFamily SelectedQueryBoxFont`
`342`	`342`	`set`
`343`	`343`	`{`
`344`	`344`	`Settings.QueryBoxFont = value.ToString();`
`345`		`- _theme.ChangeTheme();`
	`345`	`+ _theme.UpdateFonts();`
`346`	`346`	`}`
`347`	`347`	`}`
`348`	`348`
`@@ -364,7 +364,7 @@ public FamilyTypeface SelectedQueryBoxFontFaces`
`364`	`364`	`Settings.QueryBoxFontStretch = value.Stretch.ToString();`
`365`	`365`	`Settings.QueryBoxFontWeight = value.Weight.ToString();`
`366`	`366`	`Settings.QueryBoxFontStyle = value.Style.ToString();`
`367`		`- _theme.ChangeTheme();`
	`367`	`+ _theme.UpdateFonts();`
`368`	`368`	`}`
`369`	`369`	`}`
`370`	`370`
`@@ -386,7 +386,7 @@ public FontFamily SelectedResultFont`
`386`	`386`	`set`
`387`	`387`	`{`
`388`	`388`	`Settings.ResultFont = value.ToString();`
`389`		`- _theme.ChangeTheme();`
	`389`	`+ _theme.UpdateFonts();`
`390`	`390`	`}`
`391`	`391`	`}`
`392`	`392`
`@@ -408,7 +408,7 @@ public FamilyTypeface SelectedResultFontFaces`
`408`	`408`	`Settings.ResultFontStretch = value.Stretch.ToString();`
`409`	`409`	`Settings.ResultFontWeight = value.Weight.ToString();`
`410`	`410`	`Settings.ResultFontStyle = value.Style.ToString();`
`411`		`- _theme.ChangeTheme();`
	`411`	`+ _theme.UpdateFonts();`
`412`	`412`	`}`
`413`	`413`	`}`
`414`	`414`
`@@ -432,7 +432,7 @@ public FontFamily SelectedResultSubFont`
`432`	`432`	`set`
`433`	`433`	`{`
`434`	`434`	`Settings.ResultSubFont = value.ToString();`
`435`		`- _theme.ChangeTheme();`
	`435`	`+ _theme.UpdateFonts();`
`436`	`436`	`}`
`437`	`437`	`}`
`438`	`438`
`@@ -453,7 +453,7 @@ public FamilyTypeface SelectedResultSubFontFaces`
`453`	`453`	`Settings.ResultSubFontStretch = value.Stretch.ToString();`
`454`	`454`	`Settings.ResultSubFontWeight = value.Weight.ToString();`
`455`	`455`	`Settings.ResultSubFontStyle = value.Style.ToString();`
`456`		`- _theme.ChangeTheme();`
	`456`	`+ _theme.UpdateFonts();`
`457`	`457`	`}`
`458`	`458`	`}`
`459`	`459`