Merge pull request #1283 from nachmore/dev

jjw24 · web-flow · commit 85061c4422be · 2022-07-28T20:29:35.000+10:00
Force reload theme resources when changing fonts etc in settings
diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
@@ -85,10 +85,13 @@ public bool ChangeTheme(string theme)
 
                 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());
+
                 //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);
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -85,10 +85,13 @@ public bool ChangeTheme(string theme)`
`85`	`85`
`86`	`86`	`Settings.Theme = theme;`
`87`	`87`
	`88`	`+ // reload all resources even if the theme itself hasn't changed in order to pickup changes`
	`89`	`+ // to things like fonts`
	`90`	`+ UpdateResourceDictionary(GetResourceDictionary());`
	`91`	`+`
`88`	`92`	`//always allow re-loading default theme, in case of failure of switching to a new theme from default theme`
`89`	`93`	`if (_oldTheme != theme \|\| theme == defaultTheme)`
`90`	`94`	`{`
`91`		`- UpdateResourceDictionary(GetResourceDictionary());`
`92`	`95`	`_oldTheme = Path.GetFileNameWithoutExtension(_oldResource.Source.AbsolutePath);`
`93`	`96`	`}`
`94`	`97`