Merge pull request #3148 from MahApps/feature/HamburgerMenu_OnLoaded_…

…Content_Fix Fix loaded content at HamburgerMenu
MahApps · Jan 14, 2018 · 59d45bf · 59d45bf
2 parents a6d9853 + 206fe13
commit 59d45bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/MahApps.Metro/MahApps.Metro.Shared/Controls/HamburgerMenu/HamburgerMenu.cs b/src/MahApps.Metro/MahApps.Metro.Shared/Controls/HamburgerMenu/HamburgerMenu.cs
@@ -76,6 +76,11 @@ public override void OnApplyTemplate()
 
         private void HamburgerMenu_Loaded(object sender, RoutedEventArgs e)
         {
+            if (GetValue(ContentProperty) != null)
+            {
+                return;
+            }
+
             var selectedItem = _buttonsListView?.SelectedItem ?? _optionsListView?.SelectedItem;
             if (selectedItem != null)
             {

diff --git a/src/MahApps.Metro/MahApps.Metro/Styles/Controls.xaml b/src/MahApps.Metro/MahApps.Metro/Styles/Controls.xaml
@@ -38,6 +38,7 @@
         <!--  Theme styles with keys  -->
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/WindowButtonCommands.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/Dialogs/BaseMetroDialog.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/HamburgerMenu.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="FloatingMessageContainerStyle" TargetType="{x:Type ContentControl}">