Avoid injecting DefaultThemeResources multiple times

Kinnara · Oct 21, 2019 · f2d0cbd · f2d0cbd
1 parent 4cf7283
commit f2d0cbd
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/ModernWpf/ThemeResources.cs b/ModernWpf/ThemeResources.cs
@@ -290,12 +290,7 @@ private ResourceDictionary GetThemeDictionary(string key)
 
             if (ThemeDictionaries.TryGetValue(key, out ResourceDictionary themeDictionary))
             {
-                if (themeDictionary.MergedDictionaries.Count > 0 &&
-                    themeDictionary.MergedDictionaries[0] is DefaultThemeResources)
-                {
-                    // Already contains the default theme resources
-                }
-                else
+                if (!ContainsDefaultThemeResources(themeDictionary))
                 {
                     themeDictionary.MergedDictionaries.Insert(0, defaultThemeDictionary);
                 }
@@ -307,5 +302,24 @@ private ResourceDictionary GetThemeDictionary(string key)
 
             return themeDictionary;
         }
+
+        private static bool ContainsDefaultThemeResources(ResourceDictionary dictionary)
+        {
+            if (dictionary is DefaultThemeResources)
+            {
+                return true;
+            }
+
+            foreach (var mergedDictionary in dictionary.MergedDictionaries)
+            {
+                if (mergedDictionary is DefaultThemeResources ||
+                    mergedDictionary != null && ContainsDefaultThemeResources(mergedDictionary))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
     }
 }