From 4a0891cac7e603fc4cf4e1b633bb94cbbf521eb7 Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Mon, 9 Jan 2023 09:39:50 -0600
Subject: [PATCH] revise theme structure to achieve the property update

---
 Flow.Launcher.Core/Resource/Theme.cs          | 30 ++++++++++++-------
 .../ViewModel/SettingWindowViewModel.cs       |  1 -
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
index 872c4543e..20180c3d0 100644
--- a/Flow.Launcher.Core/Resource/Theme.cs
+++ b/Flow.Launcher.Core/Resource/Theme.cs
@@ -82,13 +82,14 @@ namespace Flow.Launcher.Core.Resource
             {
                 if (string.IsNullOrEmpty(path))
                     throw new DirectoryNotFoundException("Theme path can't be found <{path}>");
-
-                Settings.Theme = theme;
-
+                
                 // reload all resources even if the theme itself hasn't changed in order to pickup changes
                 // to things like fonts
-                UpdateResourceDictionary(GetResourceDictionary());
+                UpdateResourceDictionary(GetResourceDictionary(theme));
+                
+                Settings.Theme = theme;
 
+                
                 //always allow re-loading default theme, in case of failure of switching to a new theme from default theme
                 if (_oldTheme != theme || theme == defaultTheme)
                 {
@@ -134,9 +135,9 @@ namespace Flow.Launcher.Core.Resource
             _oldResource = dictionaryToUpdate;
         }
 
-        private ResourceDictionary CurrentThemeResourceDictionary()
+        private ResourceDictionary GetThemeResourceDictionary(string theme)
         {
-            var uri = GetThemePath(Settings.Theme);
+            var uri = GetThemePath(theme);
             var dict = new ResourceDictionary
             {
                 Source = new Uri(uri, UriKind.Absolute)
@@ -145,10 +146,12 @@ namespace Flow.Launcher.Core.Resource
             return dict;
         }
 
-        public ResourceDictionary GetResourceDictionary()
+        private ResourceDictionary CurrentThemeResourceDictionary() => GetThemeResourceDictionary(Settings.Theme);
+
+        public ResourceDictionary GetResourceDictionary(string theme)
         {
-            var dict = CurrentThemeResourceDictionary();
-           
+            var dict = GetThemeResourceDictionary(theme);
+            
             if (dict["QueryBoxStyle"] is Style queryBoxStyle &&
                 dict["QuerySuggestionBoxStyle"] is Style querySuggestionBoxStyle)
             {
@@ -200,6 +203,11 @@ namespace Flow.Launcher.Core.Resource
             return dict;
         }
 
+        private ResourceDictionary GetCurrentResourceDictionary( )
+        {
+            return  GetResourceDictionary(Settings.Theme);
+        }
+
         public List<string> LoadAvailableThemes()
         {
             List<string> themes = new List<string>();
@@ -229,7 +237,7 @@ namespace Flow.Launcher.Core.Resource
 
         public void AddDropShadowEffectToCurrentTheme()
         {
-            var dict = GetResourceDictionary();
+            var dict = GetCurrentResourceDictionary();
 
             var windowBorderStyle = dict["WindowBorderStyle"] as Style;
 
@@ -273,7 +281,7 @@ namespace Flow.Launcher.Core.Resource
 
         public void RemoveDropShadowEffectFromCurrentTheme()
         {
-            var dict = CurrentThemeResourceDictionary();
+            var dict = GetCurrentResourceDictionary();
             var windowBorderStyle = dict["WindowBorderStyle"] as Style;
 
             var effectSetter = windowBorderStyle.Setters.FirstOrDefault(setterBase => setterBase is Setter setter && setter.Property == Border.EffectProperty) as Setter;
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 0305b70e1..b4d2cbfe9 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -407,7 +407,6 @@ namespace Flow.Launcher.ViewModel
             get { return Settings.Theme; }
             set
             {
-                Settings.Theme = value;
                 ThemeManager.Instance.ChangeTheme(value);
 
                 if (ThemeManager.Instance.BlurEnabled && Settings.UseDropShadowEffect)