HamburgerMenu: ItemContainerStyle and OptionsItemContainerStyle prope…

…rties This makes it easier to change the inner styles for the items (and option items)
MahApps · Oct 23, 2017 · 92ab747 · 92ab747
1 parent b189e86
commit 92ab747
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/src/MahApps.Metro/MahApps.Metro.Shared/Controls/HamburgerMenu/HamburgerMenu.Options.cs b/src/MahApps.Metro/MahApps.Metro.Shared/Controls/HamburgerMenu/HamburgerMenu.Options.cs
@@ -15,6 +15,11 @@ public partial class HamburgerMenu
         /// </summary>
         public static readonly DependencyProperty OptionsItemsSourceProperty = DependencyProperty.Register(nameof(OptionsItemsSource), typeof(object), typeof(HamburgerMenu), new PropertyMetadata(null));
 
+        /// <summary>
+        /// Identifies the <see cref="OptionsItemContainerStyle"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty OptionsItemContainerStyleProperty = DependencyProperty.Register(nameof(OptionsItemContainerStyle), typeof(Style), typeof(HamburgerMenu), new PropertyMetadata(null));
+
         /// <summary>
         /// Identifies the <see cref="OptionsItemTemplate"/> dependency property.
         /// </summary>
@@ -59,6 +64,15 @@ public object OptionsItemsSource
             set { SetValue(OptionsItemsSourceProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the Style used for each item in the options.
+        /// </summary>
+        public Style OptionsItemContainerStyle
+        {
+            get { return (Style)GetValue(OptionsItemContainerStyleProperty); }
+            set { SetValue(OptionsItemContainerStyleProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets the DataTemplate used to display each item in the options.
         /// </summary>

diff --git a/src/MahApps.Metro/MahApps.Metro.Shared/Controls/HamburgerMenu/HamburgerMenu.Properties.cs b/src/MahApps.Metro/MahApps.Metro.Shared/Controls/HamburgerMenu/HamburgerMenu.Properties.cs
@@ -51,6 +51,11 @@ public partial class HamburgerMenu
         /// </summary>
         public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register(nameof(ItemsSource), typeof(object), typeof(HamburgerMenu), new PropertyMetadata(null));
 
+        /// <summary>
+        /// Identifies the <see cref="ItemContainerStyle"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty ItemContainerStyleProperty = DependencyProperty.Register(nameof(ItemContainerStyle), typeof(Style), typeof(HamburgerMenu), new PropertyMetadata(null));
+
         /// <summary>
         /// Identifies the <see cref="ItemTemplate"/> dependency property.
         /// </summary>
@@ -163,6 +168,15 @@ public object ItemsSource
             set { SetValue(ItemsSourceProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the Style used for each item.
+        /// </summary>
+        public Style ItemContainerStyle
+        {
+            get { return (Style)GetValue(ItemContainerStyleProperty); }
+            set { SetValue(ItemContainerStyleProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets the DataTemplate used to display each item.
         /// </summary>

diff --git a/src/MahApps.Metro/MahApps.Metro/Themes/HamburgerMenu.xaml b/src/MahApps.Metro/MahApps.Metro/Themes/HamburgerMenu.xaml
@@ -164,7 +164,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="HamburgerListBoxItemStyle"
+    <Style x:Key="HambugerMenuItemStyle"
            BasedOn="{StaticResource MetroListBoxItem}"
            TargetType="{x:Type ListBoxItem}">
         <Setter Property="Background" Value="Transparent" />
@@ -189,7 +189,6 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="ItemContainerStyle" Value="{StaticResource HamburgerListBoxItemStyle}" />
         <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
         <Setter Property="Template">
@@ -237,9 +236,11 @@
             </Setter.Value>
         </Setter>
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="ItemContainerStyle" Value="{StaticResource HambugerMenuItemStyle}" />
         <Setter Property="KeyboardNavigation.ControlTabNavigation" Value="Local" />
         <Setter Property="KeyboardNavigation.DirectionalNavigation" Value="Local" />
         <Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
+        <Setter Property="OptionsItemContainerStyle" Value="{StaticResource HambugerMenuItemStyle}" />
         <Setter Property="PaneBackground" Value="{DynamicResource MahApps.Metro.HamburgerMenu.PaneBackgroundBrush}" />
         <Setter Property="PaneForeground" Value="{DynamicResource MahApps.Metro.HamburgerMenu.PaneForegroundBrush}" />
         <Setter Property="Template">
@@ -280,6 +281,7 @@
                                              Controls:ScrollViewerHelper.VerticalScrollBarOnLeftSide="{TemplateBinding VerticalScrollBarOnLeftSide}"
                                              AutomationProperties.Name="Menu items"
                                              Foreground="{TemplateBinding PaneForeground}"
+                                             ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
                                              ItemTemplate="{TemplateBinding ItemTemplate}"
                                              ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
                                              ItemsSource="{TemplateBinding ItemsSource}"
@@ -296,6 +298,7 @@
                                              VerticalAlignment="Bottom"
                                              AutomationProperties.Name="Option items"
                                              Foreground="{TemplateBinding PaneForeground}"
+                                             ItemContainerStyle="{TemplateBinding OptionsItemContainerStyle}"
                                              ItemTemplate="{TemplateBinding OptionsItemTemplate}"
                                              ItemTemplateSelector="{TemplateBinding OptionsItemTemplateSelector}"
                                              ItemsSource="{TemplateBinding OptionsItemsSource}"