From 272197788b694890a37a88290e21b4a6d1f5b2ef Mon Sep 17 00:00:00 2001
From: Oren Nachman <code@nachmore.com>
Date: Tue, 19 Jul 2022 10:48:13 -0700
Subject: [PATCH 1/3] Force reload theme resources when changing fonts etc in
 settings (#625, #637)

This will mean that changing some settings will be a bit slower than before, especially when enabling blur which will reload resources twice but this is negligible and only hits in settings.
---
 Flow.Launcher.Core/Resource/Theme.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
index 6561419a1..4c1a88e23 100644
--- a/Flow.Launcher.Core/Resource/Theme.cs
+++ b/Flow.Launcher.Core/Resource/Theme.cs
@@ -85,10 +85,13 @@ namespace Flow.Launcher.Core.Resource
 
                 Settings.Theme = theme;
 
+                // #625, #637 - reload all resources even if the theme itself hasn't changed in order to pickup changes
+                // to things like fonts
+                UpdateResourceDictionary(GetResourceDictionary());
+
                 //always allow re-loading default theme, in case of failure of switching to a new theme from default theme
                 if (_oldTheme != theme || theme == defaultTheme)
                 {
-                    UpdateResourceDictionary(GetResourceDictionary());
                     _oldTheme = Path.GetFileNameWithoutExtension(_oldResource.Source.AbsolutePath);
                 }
 

From 2077c0b48cedb0769a4b031b9eed5a6388e484e8 Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Sun, 24 Jul 2022 16:23:33 -0500
Subject: [PATCH 2/3] Fix plugin info not displayed when it has multiple
 actionkeywords

---
 Flow.Launcher/SettingWindow.xaml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 1eb162a92..0436d1248 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -917,6 +917,7 @@
                             Padding="0,0,0,0"
                             Background="{DynamicResource Color01B}">
                             <ListBox
+                                Name="Plugins"
                                 Width="Auto"
                                 Margin="5,0,0,0"
                                 Padding="0,0,7,0"
@@ -928,8 +929,7 @@
                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                 SelectedItem="{Binding SelectedPlugin}"
                                 SelectionChanged="SelectedPluginChanged"
-                                SnapsToDevicePixels="True"
-                                Name="Plugins">
+                                SnapsToDevicePixels="True">
                                 <ListBox.ItemsPanel>
                                     <ItemsPanelTemplate>
                                         <StackPanel Margin="0,0,0,18" />
@@ -1118,8 +1118,8 @@
                                                             Margin="0"
                                                             Padding="1"
                                                             VerticalAlignment="Stretch"
-                                                            Content="{Binding SettingControl}" 
-                                                            SizeChanged="ItemSizeChanged"/>
+                                                            Content="{Binding SettingControl}"
+                                                            SizeChanged="ItemSizeChanged" />
                                                     </StackPanel>
 
                                                     <StackPanel>
@@ -1129,8 +1129,7 @@
                                                             VerticalAlignment="Center"
                                                             BorderThickness="0,1,0,0"
                                                             CornerRadius="0"
-                                                            Style="{DynamicResource SettingGroupBox}"
-                                                            Visibility="{Binding ActionKeywordsVisibility}">
+                                                            Style="{DynamicResource SettingGroupBox}">
                                                             <ItemsControl Style="{DynamicResource SettingGrid}">
                                                                 <StackPanel
                                                                     Margin="0,0,-14,0"

From 8498a15ff0b1989f977d0d442158a784c75fa037 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Thu, 28 Jul 2022 20:23:39 +1000
Subject: [PATCH 3/3] update comment

---
 Flow.Launcher.Core/Resource/Theme.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
index 4c1a88e23..21892303a 100644
--- a/Flow.Launcher.Core/Resource/Theme.cs
+++ b/Flow.Launcher.Core/Resource/Theme.cs
@@ -85,7 +85,7 @@ namespace Flow.Launcher.Core.Resource
 
                 Settings.Theme = theme;
 
-                // #625, #637 - reload all resources even if the theme itself hasn't changed in order to pickup changes
+                // reload all resources even if the theme itself hasn't changed in order to pickup changes
                 // to things like fonts
                 UpdateResourceDictionary(GetResourceDictionary());