make sure NavigationView gets resource from element instead app.xaml …

…resource dictionary (#123) Co-authored-by: Stefan Koell <stefan.koell@royalapps.com>
Kinnara · Jun 25, 2020 · 1e4cce8 · 1e4cce8
1 parent 5dd7ba5
commit 1e4cce8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/ModernWpf.Controls/Common/SharedHelpers.cs b/ModernWpf.Controls/Common/SharedHelpers.cs
@@ -70,6 +70,11 @@ public static object FindResource(string resource, ResourceDictionary resources,
             return resources.Contains(boxedResource) ? resources[boxedResource] : defaultValue;
         }
 
+        public static object FindResource(string resource, FrameworkElement element, object defaultValue)
+        {
+            return element.TryFindResource(resource) ?? defaultValue;
+        }
+
         public static object FindInApplicationResources(string resource, object defaultValue)
         {
             return SharedHelpers.FindResource(resource, Application.Current.Resources, defaultValue);

diff --git a/ModernWpf.Controls/NavigationView/NavigationView.cs b/ModernWpf.Controls/NavigationView/NavigationView.cs
@@ -3542,12 +3542,12 @@ int GetSelectedItemIndex()
 
         double GetPaneToggleButtonWidth()
         {
-            return (double)(SharedHelpers.FindInApplicationResources("PaneToggleButtonWidth", c_paneToggleButtonWidth));
+            return (double)(SharedHelpers.FindResource("PaneToggleButtonWidth", this, (double)c_paneToggleButtonWidth));
         }
 
         double GetPaneToggleButtonHeight()
         {
-            return (double)(SharedHelpers.FindInApplicationResources("PaneToggleButtonHeight", c_paneToggleButtonHeight));
+            return (double)(SharedHelpers.FindResource("PaneToggleButtonHeight", this, (double)c_paneToggleButtonHeight));
         }
 
         void UpdateTopNavigationWidthCache()