Merge last missing commits from Flow-Launcher#3593

Author: TBM13

Flow.Launcher.Core/Resource/LocalizedDescriptionAttribute.cs

@@ -433,9 +433,19 @@ public bool ChangeTheme(string theme = null)
                 }
                 return false;
             }
-            catch (XamlParseException)
+            catch (XamlParseException e)
             {
-                _api.LogError(ClassName, $"Theme <{theme}> fail to parse");
+                _api.LogException(ClassName, $"Theme <{theme}> fail to parse xaml", e);
+                if (theme != Constant.DefaultTheme)
+                {
+                    _api.ShowMsgBox(Localize.theme_load_failure_parse_error(theme));
+                    ChangeTheme(Constant.DefaultTheme);
+                }
+                return false;
+            }
+            catch (Exception e)
+            {
+                _api.LogException(ClassName, $"Theme <{theme}> fail to load", e);
                 if (theme != Constant.DefaultTheme)
                 {
                     _api.ShowMsgBox(Localize.theme_load_failure_parse_error(theme));

Flow.Launcher.Core/Resource/Theme.cs

@@ -1,13 +1,14 @@
-using iNKORE.UI.WPF.Modern.Controls;
-using iNKORE.UI.WPF.Modern.Controls.Helpers;
-using iNKORE.UI.WPF.Modern.Controls.Primitives;
-using System;
+using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using iNKORE.UI.WPF.Modern.Controls;
+using iNKORE.UI.WPF.Modern.Controls.Helpers;
+using iNKORE.UI.WPF.Modern.Controls.Primitives;
 
 namespace Flow.Launcher.Resources.Controls
 {
+    // TODO: Use IsScrollAnimationEnabled property in future: https://github.com/iNKORE-NET/UI.WPF.Modern/pull/347
     public class CustomScrollViewerEx : ScrollViewer
     {
         private double LastVerticalLocation = 0;