From 0ffc31d85635d437e30fbdc8d3f0436e5ebb5155 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 7 Jul 2016 13:30:12 +0200
Subject: [PATCH 01/13] format suggestions

---
 MahApps.Metro/Controls/SplitButton.cs | 184 +++++++++++++-------------
 1 file changed, 92 insertions(+), 92 deletions(-)

diff --git a/MahApps.Metro/Controls/SplitButton.cs b/MahApps.Metro/Controls/SplitButton.cs
index 9f81d42747..0162b549b3 100644
--- a/MahApps.Metro/Controls/SplitButton.cs
+++ b/MahApps.Metro/Controls/SplitButton.cs
@@ -11,50 +11,53 @@ namespace MahApps.Metro.Controls
 {
     [ContentProperty("ItemsSource")]
     [DefaultEvent("SelectionChanged"),
-    TemplatePart(Name = "PART_Container", Type = typeof(Grid)),
-    TemplatePart(Name = "PART_Button", Type = typeof(Button)),
-    TemplatePart(Name = "PART_ButtonContent", Type = typeof(ContentControl)),
-    TemplatePart(Name = "PART_Popup", Type = typeof(Popup)),
-    TemplatePart(Name = "PART_Expander", Type = typeof(Button)),
-    TemplatePart(Name = "PART_ListBox", Type = typeof(ListBox))]
+     TemplatePart(Name = "PART_Container", Type = typeof(Grid)),
+     TemplatePart(Name = "PART_Button", Type = typeof(Button)),
+     TemplatePart(Name = "PART_ButtonContent", Type = typeof(ContentControl)),
+     TemplatePart(Name = "PART_Popup", Type = typeof(Popup)),
+     TemplatePart(Name = "PART_Expander", Type = typeof(Button)),
+     TemplatePart(Name = "PART_ListBox", Type = typeof(ListBox))]
     public class SplitButton : ItemsControl
     {
-
-        public static readonly RoutedEvent ClickEvent =
-            EventManager.RegisterRoutedEvent("Click", RoutingStrategy.Bubble,
-                typeof(RoutedEventHandler), typeof(SplitButton));
-
-        public static readonly RoutedEvent SelectionChangedEvent =
-            EventManager.RegisterRoutedEvent("SelectionChanged", RoutingStrategy.Bubble,
-                typeof(SelectionChangedEventHandler), typeof(SplitButton));
+        public static readonly RoutedEvent ClickEvent
+            = EventManager.RegisterRoutedEvent("Click",
+                                               RoutingStrategy.Bubble,
+                                               typeof(RoutedEventHandler),
+                                               typeof(SplitButton));
+
+        public static readonly RoutedEvent SelectionChangedEvent
+            = EventManager.RegisterRoutedEvent("SelectionChanged",
+                                               RoutingStrategy.Bubble,
+                                               typeof(SelectionChangedEventHandler),
+                                               typeof(SplitButton));
 
         public event SelectionChangedEventHandler SelectionChanged
         {
-            add { AddHandler(SelectionChangedEvent, value); }
-            remove { RemoveHandler(SelectionChangedEvent, value); }
+            add { this.AddHandler(SelectionChangedEvent, value); }
+            remove { this.RemoveHandler(SelectionChangedEvent, value); }
         }
 
         public event RoutedEventHandler Click
         {
-            add { AddHandler(ClickEvent, value); }
-            remove { RemoveHandler(ClickEvent, value); }
+            add { this.AddHandler(ClickEvent, value); }
+            remove { this.RemoveHandler(ClickEvent, value); }
         }
 
         public static readonly DependencyProperty IsExpandedProperty = DependencyProperty.Register("IsExpanded", typeof(bool), typeof(SplitButton));
 
-        public static readonly DependencyProperty SelectedIndexProperty = DependencyProperty.Register("SelectedIndex", typeof(Int32), typeof(SplitButton), new FrameworkPropertyMetadata(-1, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
-        public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register("SelectedItem", typeof(Object), typeof(SplitButton), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
+        public static readonly DependencyProperty SelectedIndexProperty = DependencyProperty.Register("SelectedIndex", typeof(int), typeof(SplitButton), new FrameworkPropertyMetadata(-1, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
+        public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register("SelectedItem", typeof(object), typeof(SplitButton), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
 
-        public static readonly DependencyProperty ExtraTagProperty = DependencyProperty.Register("ExtraTag", typeof(Object), typeof(SplitButton));
+        public static readonly DependencyProperty ExtraTagProperty = DependencyProperty.Register("ExtraTag", typeof(object), typeof(SplitButton));
 
         public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register("Orientation", typeof(Orientation), typeof(SplitButton), new FrameworkPropertyMetadata(Orientation.Horizontal, FrameworkPropertyMetadataOptions.AffectsMeasure));
 
-        public static readonly DependencyProperty IconProperty = DependencyProperty.Register("Icon", typeof(Object), typeof(SplitButton));
+        public static readonly DependencyProperty IconProperty = DependencyProperty.Register("Icon", typeof(object), typeof(SplitButton));
         public static readonly DependencyProperty IconTemplateProperty = DependencyProperty.Register("IconTemplate", typeof(DataTemplate), typeof(SplitButton));
 
         public static readonly DependencyProperty CommandProperty = DependencyProperty.Register("Command", typeof(ICommand), typeof(SplitButton));
         public static readonly DependencyProperty CommandTargetProperty = DependencyProperty.Register("CommandTarget", typeof(IInputElement), typeof(SplitButton));
-        public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register("CommandParameter", typeof(Object), typeof(SplitButton));
+        public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register("CommandParameter", typeof(object), typeof(SplitButton));
 
         public static readonly DependencyProperty ButtonStyleProperty = DependencyProperty.Register("ButtonStyle", typeof(Style), typeof(SplitButton), new FrameworkPropertyMetadata(default(Style), FrameworkPropertyMetadataOptions.Inherits | FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure));
         public static readonly DependencyProperty ButtonArrowStyleProperty = DependencyProperty.Register("ButtonArrowStyle", typeof(Style), typeof(SplitButton), new FrameworkPropertyMetadata(default(Style), FrameworkPropertyMetadataOptions.Inherits | FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure));
@@ -64,10 +67,10 @@ public event RoutedEventHandler Click
         /// <summary>
         /// Reflects the parameter to pass to the CommandProperty upon execution. 
         /// </summary>
-        public Object CommandParameter
+        public object CommandParameter
         {
-            get { return (Object)GetValue(CommandParameterProperty); }
-            set { SetValue(CommandParameterProperty, value); }
+            get { return (object)this.GetValue(CommandParameterProperty); }
+            set { this.SetValue(CommandParameterProperty, value); }
         }
 
         /// <summary>
@@ -75,8 +78,8 @@ public Object CommandParameter
         /// </summary>
         public IInputElement CommandTarget
         {
-            get { return (IInputElement)GetValue(CommandTargetProperty); }
-            set { SetValue(CommandTargetProperty, value); }
+            get { return (IInputElement)this.GetValue(CommandTargetProperty); }
+            set { this.SetValue(CommandTargetProperty, value); }
         }
 
         /// <summary>
@@ -84,44 +87,44 @@ public IInputElement CommandTarget
         /// </summary>
         public ICommand Command
         {
-            get { return (ICommand)GetValue(CommandProperty); }
-            set { SetValue(CommandProperty, value); }
+            get { return (ICommand)this.GetValue(CommandProperty); }
+            set { this.SetValue(CommandProperty, value); }
         }
 
         /// <summary> 
         ///  The index of the first item in the current selection or -1 if the selection is empty. 
         /// </summary>
-        public Int32 SelectedIndex
+        public int SelectedIndex
         {
-            get { return (Int32)GetValue(SelectedIndexProperty); }
-            set { SetValue(SelectedIndexProperty, value); }
+            get { return (int)this.GetValue(SelectedIndexProperty); }
+            set { this.SetValue(SelectedIndexProperty, value); }
         }
 
         /// <summary>
         ///  The first item in the current selection, or null if the selection is empty. 
         /// </summary>
-        public Object SelectedItem
+        public object SelectedItem
         {
-            get { return GetValue(SelectedItemProperty); }
-            set { SetValue(SelectedItemProperty, value); }
+            get { return this.GetValue(SelectedItemProperty); }
+            set { this.SetValue(SelectedItemProperty, value); }
         }
 
         /// <summary> 
         /// Indicates whether the Popup is visible. 
         /// </summary>
-        public Boolean IsExpanded
+        public bool IsExpanded
         {
-            get { return (bool)GetValue(IsExpandedProperty); }
-            set { SetValue(IsExpandedProperty, value); }
+            get { return (bool)this.GetValue(IsExpandedProperty); }
+            set { this.SetValue(IsExpandedProperty, value); }
         }
 
         /// <summary>
         /// Gets or sets an extra tag.
         /// </summary>
-        public Object ExtraTag
+        public object ExtraTag
         {
-            get { return GetValue(ExtraTagProperty); }
-            set { SetValue(ExtraTagProperty, value); }
+            get { return this.GetValue(ExtraTagProperty); }
+            set { this.SetValue(ExtraTagProperty, value); }
         }
 
         /// <summary>
@@ -129,18 +132,18 @@ public Object ExtraTag
         /// </summary>
         public Orientation Orientation
         {
-            get { return (Orientation)GetValue(OrientationProperty); }
-            set { SetValue(OrientationProperty, value); }
+            get { return (Orientation)this.GetValue(OrientationProperty); }
+            set { this.SetValue(OrientationProperty, value); }
         }
 
         /// <summary>
         ///  Gets or sets the Content used to generate the icon part.
         /// </summary>
         [Bindable(true)]
-        public Object Icon
+        public object Icon
         {
-            get { return GetValue(IconProperty); }
-            set { SetValue(IconProperty, value); }
+            get { return this.GetValue(IconProperty); }
+            set { this.SetValue(IconProperty, value); }
         }
 
         /// <summary> 
@@ -149,8 +152,8 @@ public Object Icon
         [Bindable(true)]
         public DataTemplate IconTemplate
         {
-            get { return (DataTemplate)GetValue(IconTemplateProperty); }
-            set { SetValue(IconTemplateProperty, value); }
+            get { return (DataTemplate)this.GetValue(IconTemplateProperty); }
+            set { this.SetValue(IconTemplateProperty, value); }
         }
 
         /// <summary>
@@ -158,8 +161,8 @@ public DataTemplate IconTemplate
         /// </summary>
         public Style ButtonStyle
         {
-            get { return (Style)GetValue(ButtonStyleProperty); }
-            set { SetValue(ButtonStyleProperty, value); }
+            get { return (Style)this.GetValue(ButtonStyleProperty); }
+            set { this.SetValue(ButtonStyleProperty, value); }
         }
 
         /// <summary>
@@ -167,8 +170,8 @@ public Style ButtonStyle
         /// </summary>
         public Style ButtonArrowStyle
         {
-            get { return (Style)GetValue(ButtonArrowStyleProperty); }
-            set { SetValue(ButtonArrowStyleProperty, value); }
+            get { return (Style)this.GetValue(ButtonArrowStyleProperty); }
+            set { this.SetValue(ButtonArrowStyleProperty, value); }
         }
 
         /// <summary>
@@ -176,8 +179,8 @@ public Style ButtonArrowStyle
         /// </summary>
         public Style ListBoxStyle
         {
-            get { return (Style)GetValue(ListBoxStyleProperty); }
-            set { SetValue(ListBoxStyleProperty, value); }
+            get { return (Style)this.GetValue(ListBoxStyleProperty); }
+            set { this.SetValue(ListBoxStyleProperty, value); }
         }
 
         /// <summary>
@@ -185,8 +188,8 @@ public Style ListBoxStyle
         /// </summary>
         public Brush ArrowBrush
         {
-            get { return (Brush)GetValue(ArrowBrushProperty); }
-            set { SetValue(ArrowBrushProperty, value); }
+            get { return (Brush)this.GetValue(ArrowBrushProperty); }
+            set { this.SetValue(ArrowBrushProperty, value); }
         }
 
         private Button _clickButton;
@@ -202,58 +205,58 @@ static SplitButton()
         private void ButtonClick(object sender, RoutedEventArgs e)
         {
             e.RoutedEvent = ClickEvent;
-            RaiseEvent(e);
+            this.RaiseEvent(e);
         }
 
         private void ListBoxSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             e.RoutedEvent = SelectionChangedEvent;
-            RaiseEvent(e);
+            this.RaiseEvent(e);
 
-            IsExpanded = false;
+            this.IsExpanded = false;
         }
 
         private void ExpanderClick(object sender, RoutedEventArgs e)
         {
-            IsExpanded = !IsExpanded;
+            this.IsExpanded = !this.IsExpanded;
         }
 
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
-            _clickButton = EnforceInstance<Button>("PART_Button");
-            _expander = EnforceInstance<Button>("PART_Expander");
-            _listBox = EnforceInstance<ListBox>("PART_ListBox");
-            _popup = EnforceInstance<Popup>("PART_Popup");
-            InitializeVisualElementsContainer();
+            this._clickButton = this.EnforceInstance<Button>("PART_Button");
+            this._expander = this.EnforceInstance<Button>("PART_Expander");
+            this._listBox = this.EnforceInstance<ListBox>("PART_ListBox");
+            this._popup = this.EnforceInstance<Popup>("PART_Popup");
+            this.InitializeVisualElementsContainer();
         }
 
         //Get element from name. If it exist then element instance return, if not, new will be created
-        T EnforceInstance<T>(string partName) where T : FrameworkElement, new()
+        private T EnforceInstance<T>(string partName) where T : FrameworkElement, new()
         {
-            T element = GetTemplateChild(partName) as T ?? new T();
+            T element = this.GetTemplateChild(partName) as T ?? new T();
             return element;
         }
 
         private void InitializeVisualElementsContainer()
         {
-            _expander.Click -= ExpanderClick;
-            _clickButton.Click -= ButtonClick;
-            _listBox.SelectionChanged -= ListBoxSelectionChanged;
-            _listBox.PreviewMouseLeftButtonDown -= ListBoxPreviewMouseLeftButtonDown;
-            _popup.Opened -= PopupOpened;
-            _popup.Closed -= PopupClosed;
-
-            _expander.Click += ExpanderClick;
-            _clickButton.Click += ButtonClick;
-            _listBox.SelectionChanged += ListBoxSelectionChanged;
-            _listBox.PreviewMouseLeftButtonDown += ListBoxPreviewMouseLeftButtonDown;
-            _popup.Opened += PopupOpened;
-            _popup.Closed += PopupClosed;
+            this._expander.Click -= this.ExpanderClick;
+            this._clickButton.Click -= this.ButtonClick;
+            this._listBox.SelectionChanged -= this.ListBoxSelectionChanged;
+            this._listBox.PreviewMouseLeftButtonDown -= this.ListBoxPreviewMouseLeftButtonDown;
+            this._popup.Opened -= this.PopupOpened;
+            this._popup.Closed -= this.PopupClosed;
+
+            this._expander.Click += this.ExpanderClick;
+            this._clickButton.Click += this.ButtonClick;
+            this._listBox.SelectionChanged += this.ListBoxSelectionChanged;
+            this._listBox.PreviewMouseLeftButtonDown += this.ListBoxPreviewMouseLeftButtonDown;
+            this._popup.Opened += this.PopupOpened;
+            this._popup.Closed += this.PopupClosed;
         }
 
         //Make popup close even if no selectionchanged event fired (case when user select the save item as before)
-        void ListBoxPreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        private void ListBoxPreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             var source = e.OriginalSource as DependencyObject;
             if (source != null)
@@ -266,25 +269,22 @@ void ListBoxPreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
             }
         }
 
-        void PopupClosed(object sender, EventArgs e)
+        private void PopupClosed(object sender, EventArgs e)
         {
             this.ReleaseMouseCapture();
-            if (this._expander != null)
-            {
-                this._expander.Focus();
-            }
+            this._expander?.Focus();
         }
 
-        void PopupOpened(object sender, EventArgs e)
+        private void PopupOpened(object sender, EventArgs e)
         {
             Mouse.Capture(this, CaptureMode.SubTree);
-            Mouse.AddPreviewMouseDownOutsideCapturedElementHandler(this, OutsideCapturedElementHandler);
+            Mouse.AddPreviewMouseDownOutsideCapturedElementHandler(this, this.OutsideCapturedElementHandler);
         }
 
         private void OutsideCapturedElementHandler(object sender, MouseButtonEventArgs mouseButtonEventArgs)
         {
-            IsExpanded = false;
-            Mouse.RemovePreviewMouseDownOutsideCapturedElementHandler(this, OutsideCapturedElementHandler);
+            this.IsExpanded = false;
+            Mouse.RemovePreviewMouseDownOutsideCapturedElementHandler(this, this.OutsideCapturedElementHandler);
         }
     }
-}
+}
\ No newline at end of file

From a57fbf1c1f711d4c3d72c75be9c27cbe85407518 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 7 Jul 2016 13:47:30 +0200
Subject: [PATCH 02/13] change SplitButton to Selector to get access to
 SelectedValuePath and SelectedValue

---
 MahApps.Metro/Controls/SplitButton.cs | 35 +--------------------------
 MahApps.Metro/Themes/SplitButton.xaml |  8 ++++++
 2 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/MahApps.Metro/Controls/SplitButton.cs b/MahApps.Metro/Controls/SplitButton.cs
index 0162b549b3..c7af90e11d 100644
--- a/MahApps.Metro/Controls/SplitButton.cs
+++ b/MahApps.Metro/Controls/SplitButton.cs
@@ -17,7 +17,7 @@ namespace MahApps.Metro.Controls
      TemplatePart(Name = "PART_Popup", Type = typeof(Popup)),
      TemplatePart(Name = "PART_Expander", Type = typeof(Button)),
      TemplatePart(Name = "PART_ListBox", Type = typeof(ListBox))]
-    public class SplitButton : ItemsControl
+    public class SplitButton : Selector
     {
         public static readonly RoutedEvent ClickEvent
             = EventManager.RegisterRoutedEvent("Click",
@@ -25,18 +25,6 @@ public static readonly RoutedEvent ClickEvent
                                                typeof(RoutedEventHandler),
                                                typeof(SplitButton));
 
-        public static readonly RoutedEvent SelectionChangedEvent
-            = EventManager.RegisterRoutedEvent("SelectionChanged",
-                                               RoutingStrategy.Bubble,
-                                               typeof(SelectionChangedEventHandler),
-                                               typeof(SplitButton));
-
-        public event SelectionChangedEventHandler SelectionChanged
-        {
-            add { this.AddHandler(SelectionChangedEvent, value); }
-            remove { this.RemoveHandler(SelectionChangedEvent, value); }
-        }
-
         public event RoutedEventHandler Click
         {
             add { this.AddHandler(ClickEvent, value); }
@@ -45,9 +33,6 @@ public event RoutedEventHandler Click
 
         public static readonly DependencyProperty IsExpandedProperty = DependencyProperty.Register("IsExpanded", typeof(bool), typeof(SplitButton));
 
-        public static readonly DependencyProperty SelectedIndexProperty = DependencyProperty.Register("SelectedIndex", typeof(int), typeof(SplitButton), new FrameworkPropertyMetadata(-1, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
-        public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register("SelectedItem", typeof(object), typeof(SplitButton), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
-
         public static readonly DependencyProperty ExtraTagProperty = DependencyProperty.Register("ExtraTag", typeof(object), typeof(SplitButton));
 
         public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register("Orientation", typeof(Orientation), typeof(SplitButton), new FrameworkPropertyMetadata(Orientation.Horizontal, FrameworkPropertyMetadataOptions.AffectsMeasure));
@@ -91,24 +76,6 @@ public ICommand Command
             set { this.SetValue(CommandProperty, value); }
         }
 
-        /// <summary> 
-        ///  The index of the first item in the current selection or -1 if the selection is empty. 
-        /// </summary>
-        public int SelectedIndex
-        {
-            get { return (int)this.GetValue(SelectedIndexProperty); }
-            set { this.SetValue(SelectedIndexProperty, value); }
-        }
-
-        /// <summary>
-        ///  The first item in the current selection, or null if the selection is empty. 
-        /// </summary>
-        public object SelectedItem
-        {
-            get { return this.GetValue(SelectedItemProperty); }
-            set { this.SetValue(SelectedItemProperty, value); }
-        }
-
         /// <summary> 
         /// Indicates whether the Popup is visible. 
         /// </summary>
diff --git a/MahApps.Metro/Themes/SplitButton.xaml b/MahApps.Metro/Themes/SplitButton.xaml
index d2de38fbbc..242e92436c 100644
--- a/MahApps.Metro/Themes/SplitButton.xaml
+++ b/MahApps.Metro/Themes/SplitButton.xaml
@@ -112,6 +112,10 @@
                              ItemsSource="{TemplateBinding ItemsSource}"
                              SelectedIndex="{Binding SelectedIndex, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                              SelectedItem="{Binding SelectedItem, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                             SelectedValue="{Binding SelectedValue, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                             SelectedValuePath="{TemplateBinding SelectedValuePath}"
+                             IsSelected="{TemplateBinding IsSelected}"
+                             IsSynchronizedWithCurrentItem="{TemplateBinding IsSynchronizedWithCurrentItem}"
                              SelectionMode="Single" />
                 </Popup>
             </Grid>
@@ -228,6 +232,10 @@
                              ItemsSource="{TemplateBinding ItemsSource}"
                              SelectedIndex="{Binding SelectedIndex, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                              SelectedItem="{Binding SelectedItem, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                             SelectedValue="{Binding SelectedValue, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                             SelectedValuePath="{TemplateBinding SelectedValuePath}"
+                             IsSelected="{TemplateBinding IsSelected}"
+                             IsSynchronizedWithCurrentItem="{TemplateBinding IsSynchronizedWithCurrentItem}"
                              SelectionMode="Single" />
                 </Popup>
             </Grid>

From 368e9cf1f2d62bce9b5cd6fe50a887ca88b23266 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 7 Jul 2016 14:10:55 +0200
Subject: [PATCH 03/13] fix Popup alignment

---
 MahApps.Metro/Themes/SplitButton.xaml | 474 +++++++++++++-------------
 1 file changed, 240 insertions(+), 234 deletions(-)

diff --git a/MahApps.Metro/Themes/SplitButton.xaml b/MahApps.Metro/Themes/SplitButton.xaml
index 242e92436c..3032b518c0 100644
--- a/MahApps.Metro/Themes/SplitButton.xaml
+++ b/MahApps.Metro/Themes/SplitButton.xaml
@@ -3,243 +3,249 @@
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
     <ControlTemplate x:Key="SplitButtonHorizontal" TargetType="{x:Type Controls:SplitButton}">
-        <Border x:Name="PART_Border"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                UseLayoutRounding="True">
-            <Grid x:Name="PART_Container"
-                  HorizontalAlignment="Stretch"
-                  VerticalAlignment="Stretch">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <Button x:Name="PART_Button"
-                        Grid.Column="0"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        HorizontalContentAlignment="Stretch"
-                        VerticalContentAlignment="Stretch"
-                        Style="{TemplateBinding ButtonStyle}"
-                        Background="{TemplateBinding Background}"
-                        Foreground="{TemplateBinding Foreground}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        Command="{TemplateBinding Command}"
-                        CommandParameter="{TemplateBinding CommandParameter}"
-                        CommandTarget="{TemplateBinding CommandTarget}"
-                        FocusVisualStyle="{TemplateBinding FocusVisualStyle}"
-                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                    <StackPanel HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Orientation="Horizontal">
-                        <ContentPresenter HorizontalAlignment="Center"
-                                          VerticalAlignment="Center"
-                                          Content="{TemplateBinding Icon}"
-                                          ContentTemplate="{TemplateBinding IconTemplate}"
-                                          Focusable="False"
-                                          RecognizesAccessKey="True"
-                                          UseLayoutRounding="False" />
-                        <Controls:ContentControlEx x:Name="PART_ButtonContent"
-                                                   Margin="2"
-                                                   Padding="{TemplateBinding Padding}"
-                                                   HorizontalAlignment="Center"
-                                                   VerticalAlignment="Center"
-                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                   Content="{Binding SelectedItem, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                                   ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                   ContentStringFormat="{TemplateBinding ItemStringFormat}"
-                                                   ContentTemplate="{TemplateBinding ItemTemplate}"
-                                                   ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                                                   RecognizesAccessKey="True"
-                                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                                   UseLayoutRounding="False" />
-                    </StackPanel>
-                </Button>
-                <Button x:Name="PART_Expander"
-                        Grid.Column="1"
-                        Width="20"
-                        Style="{TemplateBinding ButtonArrowStyle}"
-                        Background="{TemplateBinding Background}"
-                        Foreground="{TemplateBinding Foreground}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        FocusVisualStyle="{TemplateBinding FocusVisualStyle}"
-                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                    <Rectangle x:Name="PART_Rectangle"
-                               Width="10"
-                               Height="6"
-                               HorizontalAlignment="Center"
-                               VerticalAlignment="Center"
-                               Fill="{TemplateBinding ArrowBrush}"
-                               UseLayoutRounding="False">
-                        <Rectangle.OpacityMask>
-                            <VisualBrush Stretch="Fill">
-                                <VisualBrush.Visual>
-                                    <Canvas Width="18"
-                                            Height="18"
-                                            Clip="F1 M 0,0L 48,0L 48,48L 0,48L 0,0"
-                                            UseLayoutRounding="False">
-                                        <Path Canvas.Left="14.9063"
-                                              Canvas.Top="15.75"
-                                              Width="18"
-                                              Height="16"
-                                              Fill="{DynamicResource BlackColorBrush}"
-                                              Data="F1 M 23.9063,25L 25.9063,23L 32.9063,15.75L 32.9063,22.25L 23.9062,31.75L 14.9063,22.25L 14.9063,15.75L 21.9063,23L 23.9063,25 Z "
-                                              Stretch="Fill" />
-                                    </Canvas>
-                                </VisualBrush.Visual>
-                            </VisualBrush>
-                        </Rectangle.OpacityMask>
-                    </Rectangle>
-                </Button>
-                <Popup x:Name="PART_Popup"
-                       MinWidth="{TemplateBinding ActualWidth}"
-                       IsOpen="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                       PlacementTarget="{Binding ElementName=PART_Button}"
-                       PopupAnimation="Fade"
-                       StaysOpen="True">
-                    <ListBox x:Name="PART_ListBox"
-                             Style="{TemplateBinding ListBoxStyle}"
-                             BorderBrush="{TemplateBinding BorderBrush}"
-                             BorderThickness="{TemplateBinding BorderThickness}"
-                             DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
-                             ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
-                             ItemContainerStyleSelector="{TemplateBinding ItemContainerStyleSelector}"
-                             ItemStringFormat="{TemplateBinding ItemStringFormat}"
-                             ItemTemplate="{TemplateBinding ItemTemplate}"
-                             ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                             ItemsSource="{TemplateBinding ItemsSource}"
-                             SelectedIndex="{Binding SelectedIndex, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                             SelectedItem="{Binding SelectedItem, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                             SelectedValue="{Binding SelectedValue, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                             SelectedValuePath="{TemplateBinding SelectedValuePath}"
-                             IsSelected="{TemplateBinding IsSelected}"
-                             IsSynchronizedWithCurrentItem="{TemplateBinding IsSynchronizedWithCurrentItem}"
-                             SelectionMode="Single" />
-                </Popup>
-            </Grid>
-        </Border>
+        <Grid UseLayoutRounding="True">
+            <Border x:Name="PART_Border"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                <Grid x:Name="PART_Container"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Button x:Name="PART_Button"
+                            Grid.Column="0"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            HorizontalContentAlignment="Stretch"
+                            VerticalContentAlignment="Stretch"
+                            Style="{TemplateBinding ButtonStyle}"
+                            Background="{TemplateBinding Background}"
+                            Foreground="{TemplateBinding Foreground}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            Command="{TemplateBinding Command}"
+                            CommandParameter="{TemplateBinding CommandParameter}"
+                            CommandTarget="{TemplateBinding CommandTarget}"
+                            FocusVisualStyle="{TemplateBinding FocusVisualStyle}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                        <StackPanel HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Orientation="Horizontal">
+                            <ContentPresenter HorizontalAlignment="Center"
+                                              VerticalAlignment="Center"
+                                              Content="{TemplateBinding Icon}"
+                                              ContentTemplate="{TemplateBinding IconTemplate}"
+                                              Focusable="False"
+                                              RecognizesAccessKey="True"
+                                              UseLayoutRounding="False" />
+                            <Controls:ContentControlEx x:Name="PART_ButtonContent"
+                                                       Margin="2"
+                                                       Padding="{TemplateBinding Padding}"
+                                                       HorizontalAlignment="Center"
+                                                       VerticalAlignment="Center"
+                                                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                       Content="{Binding SelectedItem, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
+                                                       ContentStringFormat="{TemplateBinding ItemStringFormat}"
+                                                       ContentTemplate="{TemplateBinding ItemTemplate}"
+                                                       ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                                       RecognizesAccessKey="True"
+                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                       UseLayoutRounding="False" />
+                        </StackPanel>
+                    </Button>
+                    <Button x:Name="PART_Expander"
+                            Grid.Column="1"
+                            Width="20"
+                            Style="{TemplateBinding ButtonArrowStyle}"
+                            Background="{TemplateBinding Background}"
+                            Foreground="{TemplateBinding Foreground}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            FocusVisualStyle="{TemplateBinding FocusVisualStyle}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                        <Rectangle x:Name="PART_Rectangle"
+                                   Width="10"
+                                   Height="6"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center"
+                                   Fill="{TemplateBinding ArrowBrush}"
+                                   UseLayoutRounding="False">
+                            <Rectangle.OpacityMask>
+                                <VisualBrush Stretch="Fill">
+                                    <VisualBrush.Visual>
+                                        <Canvas Width="18"
+                                                Height="18"
+                                                Clip="F1 M 0,0L 48,0L 48,48L 0,48L 0,0"
+                                                UseLayoutRounding="False">
+                                            <Path Canvas.Left="14.9063"
+                                                  Canvas.Top="15.75"
+                                                  Width="18"
+                                                  Height="16"
+                                                  Fill="{DynamicResource BlackColorBrush}"
+                                                  Data="F1 M 23.9063,25L 25.9063,23L 32.9063,15.75L 32.9063,22.25L 23.9062,31.75L 14.9063,22.25L 14.9063,15.75L 21.9063,23L 23.9063,25 Z "
+                                                  Stretch="Fill" />
+                                        </Canvas>
+                                    </VisualBrush.Visual>
+                                </VisualBrush>
+                            </Rectangle.OpacityMask>
+                        </Rectangle>
+                    </Button>
+                </Grid>
+            </Border>
+            <Popup x:Name="PART_Popup"
+                   MinWidth="{TemplateBinding ActualWidth}"
+                   IsOpen="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                   PlacementTarget="{Binding ElementName=PART_Border}"
+                   PopupAnimation="Fade"
+                   StaysOpen="True">
+                <ListBox x:Name="PART_ListBox"
+                         Margin="0"
+                         Style="{TemplateBinding ListBoxStyle}"
+                         SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                         BorderBrush="{TemplateBinding BorderBrush}"
+                         BorderThickness="{TemplateBinding BorderThickness}"
+                         DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
+                         ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
+                         ItemContainerStyleSelector="{TemplateBinding ItemContainerStyleSelector}"
+                         ItemStringFormat="{TemplateBinding ItemStringFormat}"
+                         ItemTemplate="{TemplateBinding ItemTemplate}"
+                         ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                         ItemsSource="{TemplateBinding ItemsSource}"
+                         SelectedIndex="{Binding SelectedIndex, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                         SelectedItem="{Binding SelectedItem, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                         SelectedValue="{Binding SelectedValue, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                         SelectedValuePath="{TemplateBinding SelectedValuePath}"
+                         IsSelected="{TemplateBinding IsSelected}"
+                         IsSynchronizedWithCurrentItem="{TemplateBinding IsSynchronizedWithCurrentItem}"
+                         SelectionMode="Single" />
+            </Popup>
+        </Grid>
     </ControlTemplate>
 
     <ControlTemplate x:Key="SplitButtonVertical" TargetType="{x:Type Controls:SplitButton}">
-        <Border x:Name="PART_Border"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                UseLayoutRounding="True">
-            <Grid x:Name="PART_Container"
-                  HorizontalAlignment="Stretch"
-                  VerticalAlignment="Stretch">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="*" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <Button x:Name="PART_Button"
-                        Grid.Row="0"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        HorizontalContentAlignment="Stretch"
-                        VerticalContentAlignment="Stretch"
-                        Style="{TemplateBinding ButtonStyle}"
-                        Background="{TemplateBinding Background}"
-                        Foreground="{TemplateBinding Foreground}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        Command="{TemplateBinding Command}"
-                        CommandParameter="{TemplateBinding CommandParameter}"
-                        CommandTarget="{TemplateBinding CommandTarget}"
-                        FocusVisualStyle="{TemplateBinding FocusVisualStyle}"
-                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                    <StackPanel HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Orientation="Vertical">
-                        <ContentPresenter HorizontalAlignment="Center"
-                                          VerticalAlignment="Center"
-                                          Content="{TemplateBinding Icon}"
-                                          ContentTemplate="{TemplateBinding IconTemplate}"
-                                          Focusable="False"
-                                          RecognizesAccessKey="True"
-                                          UseLayoutRounding="False" />
-                        <Controls:ContentControlEx x:Name="PART_ButtonContent"
-                                                   Margin="2"
-                                                   Padding="{TemplateBinding Padding}"
-                                                   HorizontalAlignment="Center"
-                                                   VerticalAlignment="Center"
-                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                   Content="{Binding SelectedItem, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                                   ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                   ContentStringFormat="{TemplateBinding ItemStringFormat}"
-                                                   ContentTemplate="{TemplateBinding ItemTemplate}"
-                                                   ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                                                   RecognizesAccessKey="True"
-                                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                                   UseLayoutRounding="False" />
-                    </StackPanel>
-                </Button>
-                <Button x:Name="PART_Expander"
-                        Grid.Row="1"
-                        Height="20"
-                        Style="{TemplateBinding ButtonArrowStyle}"
-                        Background="{TemplateBinding Background}"
-                        Foreground="{TemplateBinding Foreground}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        FocusVisualStyle="{TemplateBinding FocusVisualStyle}"
-                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                    <Rectangle x:Name="PART_Rectangle"
-                               Width="10"
-                               Height="6"
-                               HorizontalAlignment="Center"
-                               VerticalAlignment="Center"
-                               Fill="{TemplateBinding ArrowBrush}"
-                               UseLayoutRounding="False">
-                        <Rectangle.OpacityMask>
-                            <VisualBrush Stretch="Fill">
-                                <VisualBrush.Visual>
-                                    <Canvas Width="18"
-                                            Height="18"
-                                            Clip="F1 M 0,0L 48,0L 48,48L 0,48L 0,0"
-                                            UseLayoutRounding="False">
-                                        <Path Canvas.Left="14.9063"
-                                              Canvas.Top="15.75"
-                                              Width="18"
-                                              Height="16"
-                                              Fill="{DynamicResource BlackColorBrush}"
-                                              Data="F1 M 23.9063,25L 25.9063,23L 32.9063,15.75L 32.9063,22.25L 23.9062,31.75L 14.9063,22.25L 14.9063,15.75L 21.9063,23L 23.9063,25 Z "
-                                              Stretch="Fill" />
-                                    </Canvas>
-                                </VisualBrush.Visual>
-                            </VisualBrush>
-                        </Rectangle.OpacityMask>
-                    </Rectangle>
-                </Button>
-                <Popup x:Name="PART_Popup"
-                       MinWidth="{TemplateBinding ActualWidth}"
-                       IsOpen="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                       PlacementTarget="{Binding ElementName=PART_Expander}"
-                       PopupAnimation="Fade"
-                       StaysOpen="True">
-                    <ListBox x:Name="PART_ListBox"
-                             Style="{TemplateBinding ListBoxStyle}"
-                             BorderBrush="{TemplateBinding BorderBrush}"
-                             BorderThickness="{TemplateBinding BorderThickness}"
-                             DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
-                             ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
-                             ItemContainerStyleSelector="{TemplateBinding ItemContainerStyleSelector}"
-                             ItemStringFormat="{TemplateBinding ItemStringFormat}"
-                             ItemTemplate="{TemplateBinding ItemTemplate}"
-                             ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                             ItemsSource="{TemplateBinding ItemsSource}"
-                             SelectedIndex="{Binding SelectedIndex, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                             SelectedItem="{Binding SelectedItem, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                             SelectedValue="{Binding SelectedValue, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                             SelectedValuePath="{TemplateBinding SelectedValuePath}"
-                             IsSelected="{TemplateBinding IsSelected}"
-                             IsSynchronizedWithCurrentItem="{TemplateBinding IsSynchronizedWithCurrentItem}"
-                             SelectionMode="Single" />
-                </Popup>
-            </Grid>
-        </Border>
+        <Grid UseLayoutRounding="True">
+            <Border x:Name="PART_Border"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                <Grid x:Name="PART_Container"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Button x:Name="PART_Button"
+                            Grid.Row="0"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            HorizontalContentAlignment="Stretch"
+                            VerticalContentAlignment="Stretch"
+                            Style="{TemplateBinding ButtonStyle}"
+                            Background="{TemplateBinding Background}"
+                            Foreground="{TemplateBinding Foreground}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            Command="{TemplateBinding Command}"
+                            CommandParameter="{TemplateBinding CommandParameter}"
+                            CommandTarget="{TemplateBinding CommandTarget}"
+                            FocusVisualStyle="{TemplateBinding FocusVisualStyle}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                        <StackPanel HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Orientation="Vertical">
+                            <ContentPresenter HorizontalAlignment="Center"
+                                              VerticalAlignment="Center"
+                                              Content="{TemplateBinding Icon}"
+                                              ContentTemplate="{TemplateBinding IconTemplate}"
+                                              Focusable="False"
+                                              RecognizesAccessKey="True"
+                                              UseLayoutRounding="False" />
+                            <Controls:ContentControlEx x:Name="PART_ButtonContent"
+                                                       Margin="2"
+                                                       Padding="{TemplateBinding Padding}"
+                                                       HorizontalAlignment="Center"
+                                                       VerticalAlignment="Center"
+                                                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                       Content="{Binding SelectedItem, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
+                                                       ContentStringFormat="{TemplateBinding ItemStringFormat}"
+                                                       ContentTemplate="{TemplateBinding ItemTemplate}"
+                                                       ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                                       RecognizesAccessKey="True"
+                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                       UseLayoutRounding="False" />
+                        </StackPanel>
+                    </Button>
+                    <Button x:Name="PART_Expander"
+                            Grid.Row="1"
+                            Height="20"
+                            Style="{TemplateBinding ButtonArrowStyle}"
+                            Background="{TemplateBinding Background}"
+                            Foreground="{TemplateBinding Foreground}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            FocusVisualStyle="{TemplateBinding FocusVisualStyle}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                        <Rectangle x:Name="PART_Rectangle"
+                                   Width="10"
+                                   Height="6"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center"
+                                   Fill="{TemplateBinding ArrowBrush}"
+                                   UseLayoutRounding="False">
+                            <Rectangle.OpacityMask>
+                                <VisualBrush Stretch="Fill">
+                                    <VisualBrush.Visual>
+                                        <Canvas Width="18"
+                                                Height="18"
+                                                Clip="F1 M 0,0L 48,0L 48,48L 0,48L 0,0"
+                                                UseLayoutRounding="False">
+                                            <Path Canvas.Left="14.9063"
+                                                  Canvas.Top="15.75"
+                                                  Width="18"
+                                                  Height="16"
+                                                  Fill="{DynamicResource BlackColorBrush}"
+                                                  Data="F1 M 23.9063,25L 25.9063,23L 32.9063,15.75L 32.9063,22.25L 23.9062,31.75L 14.9063,22.25L 14.9063,15.75L 21.9063,23L 23.9063,25 Z "
+                                                  Stretch="Fill" />
+                                        </Canvas>
+                                    </VisualBrush.Visual>
+                                </VisualBrush>
+                            </Rectangle.OpacityMask>
+                        </Rectangle>
+                    </Button>
+                </Grid>
+            </Border>
+            <Popup x:Name="PART_Popup"
+                   MinWidth="{TemplateBinding ActualWidth}"
+                   IsOpen="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                   PlacementTarget="{Binding ElementName=PART_Border}"
+                   PopupAnimation="Fade"
+                   StaysOpen="True">
+                <ListBox x:Name="PART_ListBox"
+                         Margin="0"
+                         Style="{TemplateBinding ListBoxStyle}"
+                         SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                         BorderBrush="{TemplateBinding BorderBrush}"
+                         BorderThickness="{TemplateBinding BorderThickness}"
+                         DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
+                         ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
+                         ItemContainerStyleSelector="{TemplateBinding ItemContainerStyleSelector}"
+                         ItemStringFormat="{TemplateBinding ItemStringFormat}"
+                         ItemTemplate="{TemplateBinding ItemTemplate}"
+                         ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                         ItemsSource="{TemplateBinding ItemsSource}"
+                         SelectedIndex="{Binding SelectedIndex, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                         SelectedItem="{Binding SelectedItem, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                         SelectedValue="{Binding SelectedValue, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                         SelectedValuePath="{TemplateBinding SelectedValuePath}"
+                         IsSelected="{TemplateBinding IsSelected}"
+                         IsSynchronizedWithCurrentItem="{TemplateBinding IsSynchronizedWithCurrentItem}"
+                         SelectionMode="Single" />
+            </Popup>
+        </Grid>
     </ControlTemplate>
 
     <Style x:Key="ButtonSplitFocusVisual">

From c0158941fc3035e5ded6f41c6c6b1a1d9b611a44 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 7 Jul 2016 14:25:56 +0200
Subject: [PATCH 04/13] close Popup on button click

---
 MahApps.Metro/Controls/SplitButton.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MahApps.Metro/Controls/SplitButton.cs b/MahApps.Metro/Controls/SplitButton.cs
index c7af90e11d..da2870fee0 100644
--- a/MahApps.Metro/Controls/SplitButton.cs
+++ b/MahApps.Metro/Controls/SplitButton.cs
@@ -173,13 +173,13 @@ private void ButtonClick(object sender, RoutedEventArgs e)
         {
             e.RoutedEvent = ClickEvent;
             this.RaiseEvent(e);
+            this.IsExpanded = false;
         }
 
         private void ListBoxSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             e.RoutedEvent = SelectionChangedEvent;
             this.RaiseEvent(e);
-
             this.IsExpanded = false;
         }
 

From 39db42b4c80b0f5d910c3d9c17d6722c18034273 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 7 Jul 2016 14:32:11 +0200
Subject: [PATCH 05/13] add ItemsPanel TemplateBinding

---
 MahApps.Metro/Themes/SplitButton.xaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MahApps.Metro/Themes/SplitButton.xaml b/MahApps.Metro/Themes/SplitButton.xaml
index 3032b518c0..9d4df192b5 100644
--- a/MahApps.Metro/Themes/SplitButton.xaml
+++ b/MahApps.Metro/Themes/SplitButton.xaml
@@ -110,6 +110,7 @@
                          DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
                          ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
                          ItemContainerStyleSelector="{TemplateBinding ItemContainerStyleSelector}"
+                         ItemsPanel="{TemplateBinding ItemsPanel}"
                          ItemStringFormat="{TemplateBinding ItemStringFormat}"
                          ItemTemplate="{TemplateBinding ItemTemplate}"
                          ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
@@ -233,6 +234,7 @@
                          DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
                          ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
                          ItemContainerStyleSelector="{TemplateBinding ItemContainerStyleSelector}"
+                         ItemsPanel="{TemplateBinding ItemsPanel}"
                          ItemStringFormat="{TemplateBinding ItemStringFormat}"
                          ItemTemplate="{TemplateBinding ItemTemplate}"
                          ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"

From 93066a2c3b03276d06444d5751691e6c95cdf427 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 7 Jul 2016 16:34:29 +0200
Subject: [PATCH 06/13] - add 2 new dependency properties ArrowMouseOverBrush,
 ArrowPressedBrush - use PackIconMaterial Kind="ChevronDown" for arrow

---
 MahApps.Metro/Controls/DropDownButton.cs   | 20 ++++++
 MahApps.Metro/Controls/SplitButton.cs      | 20 ++++++
 MahApps.Metro/Styles/Controls.Buttons.xaml |  2 +-
 MahApps.Metro/Themes/DropDownButton.xaml   | 54 ++++++---------
 MahApps.Metro/Themes/SplitButton.xaml      | 79 ++++++----------------
 5 files changed, 83 insertions(+), 92 deletions(-)

diff --git a/MahApps.Metro/Controls/DropDownButton.cs b/MahApps.Metro/Controls/DropDownButton.cs
index 80006d695a..57410c8b2c 100644
--- a/MahApps.Metro/Controls/DropDownButton.cs
+++ b/MahApps.Metro/Controls/DropDownButton.cs
@@ -54,6 +54,8 @@ private static void IsExpandedPropertyChangedCallback(DependencyObject dependenc
         public static readonly DependencyProperty ButtonStyleProperty = DependencyProperty.Register("ButtonStyle", typeof(Style), typeof(DropDownButton), new FrameworkPropertyMetadata(default(Style), FrameworkPropertyMetadataOptions.Inherits | FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure));
         public static readonly DependencyProperty MenuStyleProperty = DependencyProperty.Register("MenuStyle", typeof(Style), typeof(DropDownButton), new FrameworkPropertyMetadata(default(Style), FrameworkPropertyMetadataOptions.Inherits | FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure));
         public static readonly DependencyProperty ArrowBrushProperty = DependencyProperty.Register("ArrowBrush", typeof(Brush), typeof(DropDownButton), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.AffectsRender));
+        public static readonly DependencyProperty ArrowMouseOverBrushProperty = DependencyProperty.Register("ArrowMouseOverBrush", typeof(Brush), typeof(DropDownButton), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.AffectsRender));
+        public static readonly DependencyProperty ArrowPressedBrushProperty = DependencyProperty.Register("ArrowPressedBrush", typeof(Brush), typeof(DropDownButton), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.AffectsRender));
         public static readonly DependencyProperty ArrowVisibilityProperty = DependencyProperty.Register("ArrowVisibility", typeof(Visibility), typeof(DropDownButton), new FrameworkPropertyMetadata(Visibility.Visible, FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure));
 
         /// <summary>
@@ -166,6 +168,24 @@ public Brush ArrowBrush
             set { SetValue(ArrowBrushProperty, value); }
         }
 
+        /// <summary>
+        /// Gets/sets the brush of the button arrow icon if the mouse is over the drop down button.
+        /// </summary>
+        public Brush ArrowMouseOverBrush
+        {
+            get { return (Brush)this.GetValue(ArrowMouseOverBrushProperty); }
+            set { this.SetValue(ArrowMouseOverBrushProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets/sets the brush of the button arrow icon if the arrow button is pressed.
+        /// </summary>
+        public Brush ArrowPressedBrush
+        {
+            get { return (Brush)this.GetValue(ArrowPressedBrushProperty); }
+            set { this.SetValue(ArrowPressedBrushProperty, value); }
+        }
+
         /// <summary>
         /// Gets/sets the visibility of the button arrow icon.
         /// </summary>
diff --git a/MahApps.Metro/Controls/SplitButton.cs b/MahApps.Metro/Controls/SplitButton.cs
index da2870fee0..caf4d78c65 100644
--- a/MahApps.Metro/Controls/SplitButton.cs
+++ b/MahApps.Metro/Controls/SplitButton.cs
@@ -48,6 +48,8 @@ public event RoutedEventHandler Click
         public static readonly DependencyProperty ButtonArrowStyleProperty = DependencyProperty.Register("ButtonArrowStyle", typeof(Style), typeof(SplitButton), new FrameworkPropertyMetadata(default(Style), FrameworkPropertyMetadataOptions.Inherits | FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure));
         public static readonly DependencyProperty ListBoxStyleProperty = DependencyProperty.Register("ListBoxStyle", typeof(Style), typeof(SplitButton), new FrameworkPropertyMetadata(default(Style), FrameworkPropertyMetadataOptions.Inherits | FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure));
         public static readonly DependencyProperty ArrowBrushProperty = DependencyProperty.Register("ArrowBrush", typeof(Brush), typeof(SplitButton), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.AffectsRender));
+        public static readonly DependencyProperty ArrowMouseOverBrushProperty = DependencyProperty.Register("ArrowMouseOverBrush", typeof(Brush), typeof(SplitButton), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.AffectsRender));
+        public static readonly DependencyProperty ArrowPressedBrushProperty = DependencyProperty.Register("ArrowPressedBrush", typeof(Brush), typeof(SplitButton), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.AffectsRender));
 
         /// <summary>
         /// Reflects the parameter to pass to the CommandProperty upon execution. 
@@ -159,6 +161,24 @@ public Brush ArrowBrush
             set { this.SetValue(ArrowBrushProperty, value); }
         }
 
+        /// <summary>
+        /// Gets/sets the brush of the button arrow icon if the mouse is over the split button.
+        /// </summary>
+        public Brush ArrowMouseOverBrush
+        {
+            get { return (Brush)this.GetValue(ArrowMouseOverBrushProperty); }
+            set { this.SetValue(ArrowMouseOverBrushProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets/sets the brush of the button arrow icon if the arrow button is pressed.
+        /// </summary>
+        public Brush ArrowPressedBrush
+        {
+            get { return (Brush)this.GetValue(ArrowPressedBrushProperty); }
+            set { this.SetValue(ArrowPressedBrushProperty, value); }
+        }
+
         private Button _clickButton;
         private Button _expander;
         private ListBox _listBox;
diff --git a/MahApps.Metro/Styles/Controls.Buttons.xaml b/MahApps.Metro/Styles/Controls.Buttons.xaml
index 8288a79d32..b96000009a 100644
--- a/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -926,7 +926,7 @@
                             <Setter TargetName="Border" Property="Background" Value="{DynamicResource GrayBrush8}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource GrayBrush6}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource GrayBrush5}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="Border" Property="Background" Value="{DynamicResource GrayBrush10}" />
diff --git a/MahApps.Metro/Themes/DropDownButton.xaml b/MahApps.Metro/Themes/DropDownButton.xaml
index 937f34bb61..1c79d18848 100644
--- a/MahApps.Metro/Themes/DropDownButton.xaml
+++ b/MahApps.Metro/Themes/DropDownButton.xaml
@@ -160,6 +160,8 @@
 
     <Style TargetType="{x:Type Controls:DropDownButton}">
         <Setter Property="ArrowBrush" Value="{DynamicResource BlackColorBrush}" />
+        <Setter Property="ArrowMouseOverBrush" Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="ArrowPressedBrush" Value="{DynamicResource BlackColorBrush}" />
         <Setter Property="Foreground" Value="{DynamicResource BlackColorBrush}" />
         <Setter Property="Background" Value="{DynamicResource WhiteColorBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource BlackColorBrush}" />
@@ -199,35 +201,16 @@
                             <DockPanel x:Name="PART_Content"
                                        Focusable="False"
                                        LastChildFill="True">
-                                <Rectangle x:Name="PART_Rectangle"
-                                           Width="10"
-                                           Height="6"
-                                           Margin="0 0 3 0"
-                                           HorizontalAlignment="Center"
-                                           VerticalAlignment="Center"
-                                           Fill="{TemplateBinding ArrowBrush}"
-                                           DockPanel.Dock="Right"
-                                           UseLayoutRounding="False"
-                                           Visibility="{TemplateBinding ArrowVisibility}">
-                                    <Rectangle.OpacityMask>
-                                        <VisualBrush Stretch="Fill">
-                                            <VisualBrush.Visual>
-                                                <Canvas Width="18"
-                                                        Height="18"
-                                                        Clip="F1 M 0,0L 48,0L 48,48L 0,48L 0,0"
-                                                        UseLayoutRounding="False">
-                                                    <Path Canvas.Left="14.9063"
-                                                          Canvas.Top="15.75"
-                                                          Width="18"
-                                                          Height="16"
-                                                          Fill="{DynamicResource BlackColorBrush}"
-                                                          Data="F1 M 23.9063,25L 25.9063,23L 32.9063,15.75L 32.9063,22.25L 23.9062,31.75L 14.9063,22.25L 14.9063,15.75L 21.9063,23L 23.9063,25 Z "
-                                                          Stretch="Fill" />
-                                                </Canvas>
-                                            </VisualBrush.Visual>
-                                        </VisualBrush>
-                                    </Rectangle.OpacityMask>
-                                </Rectangle>
+                                <Controls:PackIconMaterial x:Name="PART_Arrow"
+                                                           Kind="ChevronDown"
+                                                           Width="9"
+                                                           Height="9"
+                                                           Foreground="{TemplateBinding ArrowBrush}"
+                                                           Margin="0 0 3 0"
+                                                           HorizontalAlignment="Center"
+                                                           VerticalAlignment="Center"
+                                                           DockPanel.Dock="Right"
+                                                           Visibility="{TemplateBinding ArrowVisibility}" />
                                 <StackPanel x:Name="PART_ContentOrientation"
                                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -278,17 +261,20 @@
                         </Trigger>
                         <Trigger Property="Orientation" Value="Vertical">
                             <Setter TargetName="PART_ContentOrientation" Property="Orientation" Value="Vertical" />
-                            <Setter TargetName="PART_Rectangle" Property="DockPanel.Dock" Value="Bottom" />
-                            <Setter TargetName="PART_Rectangle" Property="Margin" Value="0 0 0 3" />
+                            <Setter TargetName="PART_Arrow" Property="DockPanel.Dock" Value="Bottom" />
+                            <Setter TargetName="PART_Arrow" Property="Margin" Value="0 0 0 3" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="PART_Arrow" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ArrowMouseOverBrush, Mode=OneWay}" />
+                        </Trigger>
+                        <Trigger SourceName="PART_Button" Property="IsPressed" Value="True">
+                            <Setter TargetName="PART_Arrow" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ArrowPressedBrush, Mode=OneWay}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
         <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="ArrowBrush" Value="{DynamicResource AccentColorBrush}" />
-            </Trigger>
             <Trigger Property="IsFocused" Value="True">
                 <Setter Property="BorderBrush" Value="{DynamicResource AccentColorBrush}" />
             </Trigger>
diff --git a/MahApps.Metro/Themes/SplitButton.xaml b/MahApps.Metro/Themes/SplitButton.xaml
index 9d4df192b5..16901a038b 100644
--- a/MahApps.Metro/Themes/SplitButton.xaml
+++ b/MahApps.Metro/Themes/SplitButton.xaml
@@ -62,36 +62,11 @@
                             Width="20"
                             Style="{TemplateBinding ButtonArrowStyle}"
                             Background="{TemplateBinding Background}"
-                            Foreground="{TemplateBinding Foreground}"
+                            Foreground="{TemplateBinding ArrowBrush}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             FocusVisualStyle="{TemplateBinding FocusVisualStyle}"
                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                        <Rectangle x:Name="PART_Rectangle"
-                                   Width="10"
-                                   Height="6"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center"
-                                   Fill="{TemplateBinding ArrowBrush}"
-                                   UseLayoutRounding="False">
-                            <Rectangle.OpacityMask>
-                                <VisualBrush Stretch="Fill">
-                                    <VisualBrush.Visual>
-                                        <Canvas Width="18"
-                                                Height="18"
-                                                Clip="F1 M 0,0L 48,0L 48,48L 0,48L 0,0"
-                                                UseLayoutRounding="False">
-                                            <Path Canvas.Left="14.9063"
-                                                  Canvas.Top="15.75"
-                                                  Width="18"
-                                                  Height="16"
-                                                  Fill="{DynamicResource BlackColorBrush}"
-                                                  Data="F1 M 23.9063,25L 25.9063,23L 32.9063,15.75L 32.9063,22.25L 23.9062,31.75L 14.9063,22.25L 14.9063,15.75L 21.9063,23L 23.9063,25 Z "
-                                                  Stretch="Fill" />
-                                        </Canvas>
-                                    </VisualBrush.Visual>
-                                </VisualBrush>
-                            </Rectangle.OpacityMask>
-                        </Rectangle>
+                        <Controls:PackIconMaterial Kind="ChevronDown" Width="9" Height="9" />
                     </Button>
                 </Grid>
             </Border>
@@ -124,6 +99,14 @@
                          SelectionMode="Single" />
             </Popup>
         </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="PART_Expander" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ArrowMouseOverBrush, Mode=OneWay}" />
+            </Trigger>
+            <Trigger SourceName="PART_Expander" Property="IsPressed" Value="True">
+                <Setter TargetName="PART_Expander" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ArrowPressedBrush, Mode=OneWay}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
     </ControlTemplate>
 
     <ControlTemplate x:Key="SplitButtonVertical" TargetType="{x:Type Controls:SplitButton}">
@@ -186,36 +169,11 @@
                             Height="20"
                             Style="{TemplateBinding ButtonArrowStyle}"
                             Background="{TemplateBinding Background}"
-                            Foreground="{TemplateBinding Foreground}"
+                            Foreground="{TemplateBinding ArrowBrush}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             FocusVisualStyle="{TemplateBinding FocusVisualStyle}"
                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                        <Rectangle x:Name="PART_Rectangle"
-                                   Width="10"
-                                   Height="6"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center"
-                                   Fill="{TemplateBinding ArrowBrush}"
-                                   UseLayoutRounding="False">
-                            <Rectangle.OpacityMask>
-                                <VisualBrush Stretch="Fill">
-                                    <VisualBrush.Visual>
-                                        <Canvas Width="18"
-                                                Height="18"
-                                                Clip="F1 M 0,0L 48,0L 48,48L 0,48L 0,0"
-                                                UseLayoutRounding="False">
-                                            <Path Canvas.Left="14.9063"
-                                                  Canvas.Top="15.75"
-                                                  Width="18"
-                                                  Height="16"
-                                                  Fill="{DynamicResource BlackColorBrush}"
-                                                  Data="F1 M 23.9063,25L 25.9063,23L 32.9063,15.75L 32.9063,22.25L 23.9062,31.75L 14.9063,22.25L 14.9063,15.75L 21.9063,23L 23.9063,25 Z "
-                                                  Stretch="Fill" />
-                                        </Canvas>
-                                    </VisualBrush.Visual>
-                                </VisualBrush>
-                            </Rectangle.OpacityMask>
-                        </Rectangle>
+                        <Controls:PackIconMaterial Kind="ChevronDown" Width="9" Height="9" />
                     </Button>
                 </Grid>
             </Border>
@@ -248,6 +206,14 @@
                          SelectionMode="Single" />
             </Popup>
         </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="PART_Expander" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ArrowMouseOverBrush, Mode=OneWay}" />
+            </Trigger>
+            <Trigger SourceName="PART_Expander" Property="IsPressed" Value="True">
+                <Setter TargetName="PART_Expander" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ArrowPressedBrush, Mode=OneWay}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
     </ControlTemplate>
 
     <Style x:Key="ButtonSplitFocusVisual">
@@ -266,6 +232,8 @@
 
     <Style TargetType="{x:Type Controls:SplitButton}">
         <Setter Property="ArrowBrush" Value="{DynamicResource BlackColorBrush}" />
+        <Setter Property="ArrowMouseOverBrush" Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="ArrowPressedBrush" Value="{DynamicResource BlackColorBrush}" />
         <Setter Property="Foreground" Value="{DynamicResource BlackColorBrush}" />
         <Setter Property="Background" Value="{DynamicResource WhiteColorBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource BlackColorBrush}" />
@@ -286,9 +254,6 @@
             <Trigger Property="Orientation" Value="Vertical">
                 <Setter Property="Template" Value="{StaticResource SplitButtonVertical}" />
             </Trigger>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="ArrowBrush" Value="{DynamicResource AccentColorBrush}" />
-            </Trigger>
             <Trigger Property="IsFocused" Value="True">
                 <Setter Property="BorderBrush" Value="{DynamicResource AccentColorBrush}" />
             </Trigger>

From 20a8b8e9112fd36dd44f87c038f042718f7bc05e Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Fri, 8 Jul 2016 13:11:40 +0200
Subject: [PATCH 07/13] enable Items usage

---
 MahApps.Metro/Controls/SplitButton.cs | 69 +++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/MahApps.Metro/Controls/SplitButton.cs b/MahApps.Metro/Controls/SplitButton.cs
index caf4d78c65..ced3f60926 100644
--- a/MahApps.Metro/Controls/SplitButton.cs
+++ b/MahApps.Metro/Controls/SplitButton.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
@@ -216,6 +217,74 @@ public override void OnApplyTemplate()
             this._listBox = this.EnforceInstance<ListBox>("PART_ListBox");
             this._popup = this.EnforceInstance<Popup>("PART_Popup");
             this.InitializeVisualElementsContainer();
+            if (this.Items != null && this.ItemsSource == null)
+            {
+                foreach (var newItem in this.Items)
+                {
+                    this._listBox.Items.Add(newItem);
+                }
+            }
+        }
+
+        /// <summary>Updates the current selection when an item in the <see cref="T:System.Windows.Controls.Primitives.Selector" /> has changed</summary>
+        /// <param name="e">The event data.</param>
+        protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
+        {
+            base.OnItemsChanged(e);
+            if (this._listBox == null || this.ItemsSource != null)
+            {
+                return;
+            }
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    if (e.NewItems != null)
+                    {
+                        foreach (var newItem in e.NewItems)
+                        {
+                            this._listBox.Items.Add(newItem);
+                        }
+                    }
+                    break;
+                case NotifyCollectionChangedAction.Remove:
+                    if (e.OldItems != null)
+                    {
+                        foreach (var oldItem in e.OldItems)
+                        {
+                            this._listBox.Items.Remove(oldItem);
+                        }
+                    }
+                    break;
+                case NotifyCollectionChangedAction.Move:
+                case NotifyCollectionChangedAction.Replace:
+                    if (e.OldItems != null)
+                    {
+                        foreach (var oldItem in e.OldItems)
+                        {
+                            this._listBox.Items.Remove(oldItem);
+                        }
+                    }
+                    if (e.NewItems != null)
+                    {
+                        foreach (var newItem in e.NewItems)
+                        {
+                            this._listBox.Items.Add(newItem);
+                        }
+                    }
+                    break;
+                case NotifyCollectionChangedAction.Reset:
+                    if (this.Items != null)
+                    {
+                        this._listBox.Items.Clear();
+                        foreach (var newItem in this.Items)
+                        {
+                            this._listBox.Items.Add(newItem);
+                        }
+                    }
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
         }
 
         //Get element from name. If it exist then element instance return, if not, new will be created

From 542f8e3a97588165c327e917a24f225fe1ba6181 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Fri, 8 Jul 2016 13:15:16 +0200
Subject: [PATCH 08/13] r# style

---
 MahApps.Metro/Controls/DropDownButton.cs | 111 +++++++++++------------
 1 file changed, 55 insertions(+), 56 deletions(-)

diff --git a/MahApps.Metro/Controls/DropDownButton.cs b/MahApps.Metro/Controls/DropDownButton.cs
index 57410c8b2c..f5d1ab9838 100644
--- a/MahApps.Metro/Controls/DropDownButton.cs
+++ b/MahApps.Metro/Controls/DropDownButton.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel;
+using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
@@ -11,19 +10,19 @@ namespace MahApps.Metro.Controls
 {
     [ContentProperty("ItemsSource")]
     [TemplatePart(Name = "PART_Button", Type = typeof(Button)),
-    TemplatePart(Name = "PART_Image", Type = typeof(Image)),
-    TemplatePart(Name = "PART_ButtonContent", Type = typeof(ContentControl)),
-    TemplatePart(Name = "PART_Menu", Type = typeof(ContextMenu))]
+     TemplatePart(Name = "PART_Image", Type = typeof(Image)),
+     TemplatePart(Name = "PART_ButtonContent", Type = typeof(ContentControl)),
+     TemplatePart(Name = "PART_Menu", Type = typeof(ContextMenu))]
     public class DropDownButton : ItemsControl
     {
         public static readonly RoutedEvent ClickEvent =
             EventManager.RegisterRoutedEvent("Click", RoutingStrategy.Bubble,
-                typeof(RoutedEventHandler), typeof(DropDownButton));
+                                             typeof(RoutedEventHandler), typeof(DropDownButton));
 
         public event RoutedEventHandler Click
         {
-            add { AddHandler(ClickEvent, value); }
-            remove { RemoveHandler(ClickEvent, value); }
+            add { this.AddHandler(ClickEvent, value); }
+            remove { this.RemoveHandler(ClickEvent, value); }
         }
 
         public static readonly DependencyProperty IsExpandedProperty = DependencyProperty.Register("IsExpanded", typeof(bool), typeof(DropDownButton), new FrameworkPropertyMetadata(new PropertyChangedCallback(IsExpandedPropertyChangedCallback)));
@@ -38,18 +37,18 @@ private static void IsExpandedPropertyChangedCallback(DependencyObject dependenc
             }
         }
 
-        public static readonly DependencyProperty ExtraTagProperty = DependencyProperty.Register("ExtraTag", typeof(Object), typeof(DropDownButton));
+        public static readonly DependencyProperty ExtraTagProperty = DependencyProperty.Register("ExtraTag", typeof(object), typeof(DropDownButton));
 
         public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register("Orientation", typeof(Orientation), typeof(DropDownButton), new FrameworkPropertyMetadata(Orientation.Horizontal, FrameworkPropertyMetadataOptions.AffectsMeasure));
 
-        public static readonly DependencyProperty IconProperty = DependencyProperty.Register("Icon", typeof(Object), typeof(DropDownButton));
+        public static readonly DependencyProperty IconProperty = DependencyProperty.Register("Icon", typeof(object), typeof(DropDownButton));
         public static readonly DependencyProperty IconTemplateProperty = DependencyProperty.Register("IconTemplate", typeof(DataTemplate), typeof(DropDownButton));
 
         public static readonly DependencyProperty CommandProperty = DependencyProperty.Register("Command", typeof(ICommand), typeof(DropDownButton));
         public static readonly DependencyProperty CommandTargetProperty = DependencyProperty.Register("CommandTarget", typeof(IInputElement), typeof(DropDownButton));
-        public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register("CommandParameter", typeof(Object), typeof(DropDownButton));
+        public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register("CommandParameter", typeof(object), typeof(DropDownButton));
 
-        public static readonly DependencyProperty ContentProperty = DependencyProperty.Register("Content", typeof(Object), typeof(DropDownButton));
+        public static readonly DependencyProperty ContentProperty = DependencyProperty.Register("Content", typeof(object), typeof(DropDownButton));
 
         public static readonly DependencyProperty ButtonStyleProperty = DependencyProperty.Register("ButtonStyle", typeof(Style), typeof(DropDownButton), new FrameworkPropertyMetadata(default(Style), FrameworkPropertyMetadataOptions.Inherits | FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure));
         public static readonly DependencyProperty MenuStyleProperty = DependencyProperty.Register("MenuStyle", typeof(Style), typeof(DropDownButton), new FrameworkPropertyMetadata(default(Style), FrameworkPropertyMetadataOptions.Inherits | FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure));
@@ -61,19 +60,19 @@ private static void IsExpandedPropertyChangedCallback(DependencyObject dependenc
         /// <summary>
         /// Gets or sets the Content of this control..
         /// </summary>
-        public Object Content
+        public object Content
         {
-            get { return (Object)GetValue(ContentProperty); }
-            set { SetValue(ContentProperty, value); }
+            get { return (object)this.GetValue(ContentProperty); }
+            set { this.SetValue(ContentProperty, value); }
         }
 
         /// <summary>
         /// Reflects the parameter to pass to the CommandProperty upon execution. 
         /// </summary>
-        public Object CommandParameter
+        public object CommandParameter
         {
-            get { return (Object)GetValue(CommandParameterProperty); }
-            set { SetValue(CommandParameterProperty, value); }
+            get { return (object)this.GetValue(CommandParameterProperty); }
+            set { this.SetValue(CommandParameterProperty, value); }
         }
 
         /// <summary>
@@ -81,8 +80,8 @@ public Object CommandParameter
         /// </summary>
         public IInputElement CommandTarget
         {
-            get { return (IInputElement)GetValue(CommandTargetProperty); }
-            set { SetValue(CommandTargetProperty, value); }
+            get { return (IInputElement)this.GetValue(CommandTargetProperty); }
+            set { this.SetValue(CommandTargetProperty, value); }
         }
 
         /// <summary>
@@ -90,26 +89,26 @@ public IInputElement CommandTarget
         /// </summary>
         public ICommand Command
         {
-            get { return (ICommand)GetValue(CommandProperty); }
-            set { SetValue(CommandProperty, value); }
+            get { return (ICommand)this.GetValue(CommandProperty); }
+            set { this.SetValue(CommandProperty, value); }
         }
 
         /// <summary> 
         /// Indicates whether the Menu is visible. 
         /// </summary>
-        public Boolean IsExpanded
+        public bool IsExpanded
         {
-            get { return (bool)GetValue(IsExpandedProperty); }
-            set { SetValue(IsExpandedProperty, value); }
+            get { return (bool)this.GetValue(IsExpandedProperty); }
+            set { this.SetValue(IsExpandedProperty, value); }
         }
 
         /// <summary>
         /// Gets or sets an extra tag.
         /// </summary>
-        public Object ExtraTag
+        public object ExtraTag
         {
-            get { return GetValue(ExtraTagProperty); }
-            set { SetValue(ExtraTagProperty, value); }
+            get { return this.GetValue(ExtraTagProperty); }
+            set { this.SetValue(ExtraTagProperty, value); }
         }
 
         /// <summary>
@@ -117,18 +116,18 @@ public Object ExtraTag
         /// </summary>
         public Orientation Orientation
         {
-            get { return (Orientation)GetValue(OrientationProperty); }
-            set { SetValue(OrientationProperty, value); }
+            get { return (Orientation)this.GetValue(OrientationProperty); }
+            set { this.SetValue(OrientationProperty, value); }
         }
 
         /// <summary>
         ///  Gets or sets the Content used to generate the icon part.
         /// </summary>
         [Bindable(true)]
-        public Object Icon
+        public object Icon
         {
-            get { return GetValue(IconProperty); }
-            set { SetValue(IconProperty, value); }
+            get { return this.GetValue(IconProperty); }
+            set { this.SetValue(IconProperty, value); }
         }
 
         /// <summary> 
@@ -137,8 +136,8 @@ public Object Icon
         [Bindable(true)]
         public DataTemplate IconTemplate
         {
-            get { return (DataTemplate)GetValue(IconTemplateProperty); }
-            set { SetValue(IconTemplateProperty, value); }
+            get { return (DataTemplate)this.GetValue(IconTemplateProperty); }
+            set { this.SetValue(IconTemplateProperty, value); }
         }
 
         /// <summary>
@@ -146,8 +145,8 @@ public DataTemplate IconTemplate
         /// </summary>
         public Style ButtonStyle
         {
-            get { return (Style)GetValue(ButtonStyleProperty); }
-            set { SetValue(ButtonStyleProperty, value); }
+            get { return (Style)this.GetValue(ButtonStyleProperty); }
+            set { this.SetValue(ButtonStyleProperty, value); }
         }
 
         /// <summary>
@@ -155,8 +154,8 @@ public Style ButtonStyle
         /// </summary>
         public Style MenuStyle
         {
-            get { return (Style)GetValue(MenuStyleProperty); }
-            set { SetValue(MenuStyleProperty, value); }
+            get { return (Style)this.GetValue(MenuStyleProperty); }
+            set { this.SetValue(MenuStyleProperty, value); }
         }
 
         /// <summary>
@@ -164,8 +163,8 @@ public Style MenuStyle
         /// </summary>
         public Brush ArrowBrush
         {
-            get { return (Brush)GetValue(ArrowBrushProperty); }
-            set { SetValue(ArrowBrushProperty, value); }
+            get { return (Brush)this.GetValue(ArrowBrushProperty); }
+            set { this.SetValue(ArrowBrushProperty, value); }
         }
 
         /// <summary>
@@ -191,8 +190,8 @@ public Brush ArrowPressedBrush
         /// </summary>
         public Visibility ArrowVisibility
         {
-            get { return (Visibility)GetValue(ArrowVisibilityProperty); }
-            set { SetValue(ArrowVisibilityProperty, value); }
+            get { return (Visibility)this.GetValue(ArrowVisibilityProperty); }
+            set { this.SetValue(ArrowVisibilityProperty, value); }
         }
 
         private Button clickButton;
@@ -205,37 +204,37 @@ static DropDownButton()
 
         private void ButtonClick(object sender, RoutedEventArgs e)
         {
-            IsExpanded = true;
+            this.IsExpanded = true;
             e.RoutedEvent = ClickEvent;
-            RaiseEvent(e);
+            this.RaiseEvent(e);
         }
 
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
-            clickButton = EnforceInstance<Button>("PART_Button");
-            menu = EnforceInstance<ContextMenu>("PART_Menu");
-            InitializeVisualElementsContainer();
+            this.clickButton = this.EnforceInstance<Button>("PART_Button");
+            this.menu = this.EnforceInstance<ContextMenu>("PART_Menu");
+            this.InitializeVisualElementsContainer();
         }
 
         //Get element from name. If it exist then element instance return, if not, new will be created
-        T EnforceInstance<T>(string partName) where T : FrameworkElement, new()
+        private T EnforceInstance<T>(string partName) where T : FrameworkElement, new()
         {
-            T element = GetTemplateChild(partName) as T ?? new T();
+            T element = this.GetTemplateChild(partName) as T ?? new T();
             return element;
         }
 
         private void InitializeVisualElementsContainer()
         {
-            MouseRightButtonUp -= DropDownButton_MouseRightButtonUp;
-            clickButton.Click -= ButtonClick;
-            MouseRightButtonUp += DropDownButton_MouseRightButtonUp;
-            clickButton.Click += ButtonClick;
+            this.MouseRightButtonUp -= this.DropDownButtonMouseRightButtonUp;
+            this.clickButton.Click -= this.ButtonClick;
+            this.MouseRightButtonUp += this.DropDownButtonMouseRightButtonUp;
+            this.clickButton.Click += this.ButtonClick;
         }
 
-        void DropDownButton_MouseRightButtonUp(object sender, MouseButtonEventArgs e)
+        private void DropDownButtonMouseRightButtonUp(object sender, MouseButtonEventArgs e)
         {
             e.Handled = true;
         }
     }
-}
+}
\ No newline at end of file

From 9ac8f32c04158500199ed625c3a95fc0fdccecdc Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Fri, 8 Jul 2016 13:20:31 +0200
Subject: [PATCH 09/13] better check for null

---
 MahApps.Metro/Controls/SplitButton.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MahApps.Metro/Controls/SplitButton.cs b/MahApps.Metro/Controls/SplitButton.cs
index ced3f60926..47678c84f2 100644
--- a/MahApps.Metro/Controls/SplitButton.cs
+++ b/MahApps.Metro/Controls/SplitButton.cs
@@ -217,7 +217,7 @@ public override void OnApplyTemplate()
             this._listBox = this.EnforceInstance<ListBox>("PART_ListBox");
             this._popup = this.EnforceInstance<Popup>("PART_Popup");
             this.InitializeVisualElementsContainer();
-            if (this.Items != null && this.ItemsSource == null)
+            if (this._listBox != null && this.Items != null && this.ItemsSource == null)
             {
                 foreach (var newItem in this.Items)
                 {

From fd9b44091db9d9a2cd5ec7f512d46c95f1550500 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Fri, 8 Jul 2016 13:23:38 +0200
Subject: [PATCH 10/13] enable Items usage for DropDownButton too

---
 MahApps.Metro/Controls/DropDownButton.cs | 72 +++++++++++++++++++++++-
 MahApps.Metro/Themes/DropDownButton.xaml |  1 +
 2 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/MahApps.Metro/Controls/DropDownButton.cs b/MahApps.Metro/Controls/DropDownButton.cs
index f5d1ab9838..3371a3a0e9 100644
--- a/MahApps.Metro/Controls/DropDownButton.cs
+++ b/MahApps.Metro/Controls/DropDownButton.cs
@@ -1,4 +1,6 @@
-using System.ComponentModel;
+using System;
+using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
@@ -215,6 +217,74 @@ public override void OnApplyTemplate()
             this.clickButton = this.EnforceInstance<Button>("PART_Button");
             this.menu = this.EnforceInstance<ContextMenu>("PART_Menu");
             this.InitializeVisualElementsContainer();
+            if (this.menu != null && this.Items != null && this.ItemsSource == null)
+            {
+                foreach (var newItem in this.Items)
+                {
+                    this.menu.Items.Add(newItem);
+                }
+            }
+        }
+
+        /// <summary>Invoked when the <see cref="P:System.Windows.Controls.ItemsControl.Items" /> property changes.</summary>
+        /// <param name="e">Information about the change.</param>
+        protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
+        {
+            base.OnItemsChanged(e);
+            if (this.menu == null || this.ItemsSource != null)
+            {
+                return;
+            }
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    if (e.NewItems != null)
+                    {
+                        foreach (var newItem in e.NewItems)
+                        {
+                            this.menu.Items.Add(newItem);
+                        }
+                    }
+                    break;
+                case NotifyCollectionChangedAction.Remove:
+                    if (e.OldItems != null)
+                    {
+                        foreach (var oldItem in e.OldItems)
+                        {
+                            this.menu.Items.Remove(oldItem);
+                        }
+                    }
+                    break;
+                case NotifyCollectionChangedAction.Move:
+                case NotifyCollectionChangedAction.Replace:
+                    if (e.OldItems != null)
+                    {
+                        foreach (var oldItem in e.OldItems)
+                        {
+                            this.menu.Items.Remove(oldItem);
+                        }
+                    }
+                    if (e.NewItems != null)
+                    {
+                        foreach (var newItem in e.NewItems)
+                        {
+                            this.menu.Items.Add(newItem);
+                        }
+                    }
+                    break;
+                case NotifyCollectionChangedAction.Reset:
+                    if (this.Items != null)
+                    {
+                        this.menu.Items.Clear();
+                        foreach (var newItem in this.Items)
+                        {
+                            this.menu.Items.Add(newItem);
+                        }
+                    }
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
         }
 
         //Get element from name. If it exist then element instance return, if not, new will be created
diff --git a/MahApps.Metro/Themes/DropDownButton.xaml b/MahApps.Metro/Themes/DropDownButton.xaml
index 1c79d18848..3d608ff856 100644
--- a/MahApps.Metro/Themes/DropDownButton.xaml
+++ b/MahApps.Metro/Themes/DropDownButton.xaml
@@ -251,6 +251,7 @@
                                              ItemTemplate="{TemplateBinding ItemTemplate}"
                                              ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
                                              ItemsSource="{TemplateBinding ItemsSource}"
+                                             ItemsPanel="{TemplateBinding ItemsPanel}"
                                              StaysOpen="False" />
                             </Button.ContextMenu>
                         </Button>

From c6e676e1bcefb17be12b42d9abb6c1e691e73b54 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Fri, 8 Jul 2016 13:42:44 +0200
Subject: [PATCH 11/13] handle tree conflicts

---
 MahApps.Metro/Controls/DropDownButton.cs | 18 ++++++++++++++++++
 MahApps.Metro/Controls/SplitButton.cs    | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/MahApps.Metro/Controls/DropDownButton.cs b/MahApps.Metro/Controls/DropDownButton.cs
index 3371a3a0e9..eafeda9aae 100644
--- a/MahApps.Metro/Controls/DropDownButton.cs
+++ b/MahApps.Metro/Controls/DropDownButton.cs
@@ -221,11 +221,26 @@ public override void OnApplyTemplate()
             {
                 foreach (var newItem in this.Items)
                 {
+                    this.TryRemoveVisualFromOldTree(newItem);
                     this.menu.Items.Add(newItem);
                 }
             }
         }
 
+        private void TryRemoveVisualFromOldTree(object newItem)
+        {
+            var visual = newItem as Visual;
+            if (visual != null)
+            {
+                var fe = LogicalTreeHelper.GetParent(visual) as FrameworkElement ?? VisualTreeHelper.GetParent(visual) as FrameworkElement;
+                if (Equals(this, fe))
+                {
+                    this.RemoveLogicalChild(visual);
+                    this.RemoveVisualChild(visual);
+                }
+            }
+        }
+
         /// <summary>Invoked when the <see cref="P:System.Windows.Controls.ItemsControl.Items" /> property changes.</summary>
         /// <param name="e">Information about the change.</param>
         protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
@@ -242,6 +257,7 @@ protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
                     {
                         foreach (var newItem in e.NewItems)
                         {
+                            this.TryRemoveVisualFromOldTree(newItem);
                             this.menu.Items.Add(newItem);
                         }
                     }
@@ -268,6 +284,7 @@ protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
                     {
                         foreach (var newItem in e.NewItems)
                         {
+                            this.TryRemoveVisualFromOldTree(newItem);
                             this.menu.Items.Add(newItem);
                         }
                     }
@@ -278,6 +295,7 @@ protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
                         this.menu.Items.Clear();
                         foreach (var newItem in this.Items)
                         {
+                            this.TryRemoveVisualFromOldTree(newItem);
                             this.menu.Items.Add(newItem);
                         }
                     }
diff --git a/MahApps.Metro/Controls/SplitButton.cs b/MahApps.Metro/Controls/SplitButton.cs
index 47678c84f2..a4d0319147 100644
--- a/MahApps.Metro/Controls/SplitButton.cs
+++ b/MahApps.Metro/Controls/SplitButton.cs
@@ -221,11 +221,26 @@ public override void OnApplyTemplate()
             {
                 foreach (var newItem in this.Items)
                 {
+                    this.TryRemoveVisualFromOldTree(newItem);
                     this._listBox.Items.Add(newItem);
                 }
             }
         }
 
+        private void TryRemoveVisualFromOldTree(object newItem)
+        {
+            var visual = newItem as Visual;
+            if (visual != null)
+            {
+                var fe = LogicalTreeHelper.GetParent(visual) as FrameworkElement ?? VisualTreeHelper.GetParent(visual) as FrameworkElement;
+                if (Equals(this, fe))
+                {
+                    this.RemoveLogicalChild(visual);
+                    this.RemoveVisualChild(visual);
+                }
+            }
+        }
+
         /// <summary>Updates the current selection when an item in the <see cref="T:System.Windows.Controls.Primitives.Selector" /> has changed</summary>
         /// <param name="e">The event data.</param>
         protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
@@ -242,6 +257,7 @@ protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
                     {
                         foreach (var newItem in e.NewItems)
                         {
+                            this.TryRemoveVisualFromOldTree(newItem);
                             this._listBox.Items.Add(newItem);
                         }
                     }
@@ -268,6 +284,7 @@ protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
                     {
                         foreach (var newItem in e.NewItems)
                         {
+                            this.TryRemoveVisualFromOldTree(newItem);
                             this._listBox.Items.Add(newItem);
                         }
                     }
@@ -278,6 +295,7 @@ protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
                         this._listBox.Items.Clear();
                         foreach (var newItem in this.Items)
                         {
+                            this.TryRemoveVisualFromOldTree(newItem);
                             this._listBox.Items.Add(newItem);
                         }
                     }

From c2173eda8d355710061942c59fc36e9bbb985058 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Fri, 8 Jul 2016 14:32:11 +0200
Subject: [PATCH 12/13] add new dependency properties ContentTemplate,
 ContentTemplateSelector and ContentStringFormat for DropDownButton

---
 MahApps.Metro/Controls/DropDownButton.cs    | 48 ++++++++++++
 MahApps.Metro/Converters/IsNullConverter.cs |  1 -
 MahApps.Metro/Themes/DropDownButton.xaml    | 86 +++++++++++++++++++--
 3 files changed, 127 insertions(+), 8 deletions(-)

diff --git a/MahApps.Metro/Controls/DropDownButton.cs b/MahApps.Metro/Controls/DropDownButton.cs
index eafeda9aae..a21ac55e6b 100644
--- a/MahApps.Metro/Controls/DropDownButton.cs
+++ b/MahApps.Metro/Controls/DropDownButton.cs
@@ -51,6 +51,18 @@ private static void IsExpandedPropertyChangedCallback(DependencyObject dependenc
         public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register("CommandParameter", typeof(object), typeof(DropDownButton));
 
         public static readonly DependencyProperty ContentProperty = DependencyProperty.Register("Content", typeof(object), typeof(DropDownButton));
+        /// <summary>
+        /// The DependencyProperty for the ContentTemplate property.
+        /// </summary>
+        public static readonly DependencyProperty ContentTemplateProperty = DependencyProperty.Register("ContentTemplate", typeof(DataTemplate), typeof(DropDownButton), new FrameworkPropertyMetadata((DataTemplate)null));
+        /// <summary>
+        /// The DependencyProperty for the ContentTemplateSelector property.
+        /// </summary>
+        public static readonly DependencyProperty ContentTemplateSelectorProperty = DependencyProperty.Register("ContentTemplateSelector", typeof(DataTemplateSelector), typeof(DropDownButton), new FrameworkPropertyMetadata((DataTemplateSelector)null));
+        /// <summary>
+        /// The DependencyProperty for the ContentStringFormat property. 
+        /// </summary> 
+        public static readonly DependencyProperty ContentStringFormatProperty = DependencyProperty.Register("ContentStringFormat", typeof(string), typeof(DropDownButton), new FrameworkPropertyMetadata((string)null));
 
         public static readonly DependencyProperty ButtonStyleProperty = DependencyProperty.Register("ButtonStyle", typeof(Style), typeof(DropDownButton), new FrameworkPropertyMetadata(default(Style), FrameworkPropertyMetadataOptions.Inherits | FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure));
         public static readonly DependencyProperty MenuStyleProperty = DependencyProperty.Register("MenuStyle", typeof(Style), typeof(DropDownButton), new FrameworkPropertyMetadata(default(Style), FrameworkPropertyMetadataOptions.Inherits | FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure));
@@ -68,6 +80,42 @@ public object Content
             set { this.SetValue(ContentProperty, value); }
         }
 
+        /// <summary> 
+        /// ContentTemplate is the template used to display the content of the control. 
+        /// </summary>
+        [Bindable(true)]
+        public DataTemplate ContentTemplate
+        {
+            get { return (DataTemplate)this.GetValue(ContentTemplateProperty); }
+            set { this.SetValue(ContentTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// ContentTemplateSelector allows to provide custom logic for choosing the template used to display the content of the control.
+        /// </summary>
+        /// <remarks> 
+        /// This property is ignored if <seealso cref="ContentTemplate"/> is set.
+        /// </remarks>
+        [Bindable(true)]
+        public DataTemplateSelector ContentTemplateSelector
+        {
+            get { return (DataTemplateSelector)this.GetValue(ContentTemplateSelectorProperty); }
+            set { this.SetValue(ContentTemplateSelectorProperty, value); }
+        }
+
+        /// <summary>
+        /// ContentStringFormat is the format used to display the content of the control as a string
+        /// </summary>
+        /// <remarks> 
+        /// This property is ignored if <seealso cref="ContentTemplate"/> is set.
+        /// </remarks>
+        [Bindable(true)]
+        public string ContentStringFormat
+        {
+            get { return (string)this.GetValue(ContentStringFormatProperty); }
+            set { this.SetValue(ContentStringFormatProperty, value); }
+        }
+
         /// <summary>
         /// Reflects the parameter to pass to the CommandProperty upon execution. 
         /// </summary>
diff --git a/MahApps.Metro/Converters/IsNullConverter.cs b/MahApps.Metro/Converters/IsNullConverter.cs
index 90ce601e58..40b7610374 100644
--- a/MahApps.Metro/Converters/IsNullConverter.cs
+++ b/MahApps.Metro/Converters/IsNullConverter.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Windows;
 using System.Windows.Data;
 
 namespace MahApps.Metro.Converters
diff --git a/MahApps.Metro/Themes/DropDownButton.xaml b/MahApps.Metro/Themes/DropDownButton.xaml
index 3d608ff856..0fcd119c88 100644
--- a/MahApps.Metro/Themes/DropDownButton.xaml
+++ b/MahApps.Metro/Themes/DropDownButton.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
+                    xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters">
 
     <!--  obsolete  -->
     <ControlTemplate x:Key="SplitButtonHorizontal" TargetType="{x:Type Controls:DropDownButton}">
@@ -26,8 +27,9 @@
                                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                     Content="{Binding Content, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                    ContentStringFormat="{TemplateBinding ItemStringFormat}"
-                                    ContentTemplate="{TemplateBinding ItemTemplate}" />
+                                    ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                    ContentTemplate="{TemplateBinding ContentTemplate}" />
                     <Rectangle x:Name="PART_Rectangle"
                                Width="10"
                                Height="6"
@@ -70,6 +72,29 @@
                 </Button.ContextMenu>
             </Button>
         </Border>
+        <ControlTemplate.Triggers>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ContentTemplate, Converter={x:Static converters:IsNullConverter.Instance}}" Value="True" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemTemplate, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
+                </MultiDataTrigger.Conditions>
+                <Setter TargetName="PART_ButtonContent" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemTemplate, Mode=OneWay}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ContentTemplateSelector, Converter={x:Static converters:IsNullConverter.Instance}}" Value="True" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemTemplateSelector, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
+                </MultiDataTrigger.Conditions>
+                <Setter TargetName="PART_ButtonContent" Property="ContentTemplateSelector" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemTemplateSelector, Mode=OneWay}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ContentStringFormat, Converter={x:Static converters:IsNullConverter.Instance}}" Value="True" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemStringFormat, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
+                </MultiDataTrigger.Conditions>
+                <Setter TargetName="PART_ButtonContent" Property="ContentStringFormat" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemStringFormat, Mode=OneWay}" />
+            </MultiDataTrigger>
+        </ControlTemplate.Triggers>
     </ControlTemplate>
 
     <!--  obsolete  -->
@@ -98,8 +123,9 @@
                                     VerticalAlignment="Stretch"
                                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                                     Content="{Binding Content, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                    ContentStringFormat="{TemplateBinding ItemStringFormat}"
-                                    ContentTemplate="{TemplateBinding ItemTemplate}" />
+                                    ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                    ContentTemplate="{TemplateBinding ContentTemplate}" />
                     <Rectangle x:Name="PART_Rectangle"
                                Width="10"
                                Height="6"
@@ -142,6 +168,29 @@
                 </Button.ContextMenu>
             </Button>
         </Border>
+        <ControlTemplate.Triggers>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ContentTemplate, Converter={x:Static converters:IsNullConverter.Instance}}" Value="True" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemTemplate, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
+                </MultiDataTrigger.Conditions>
+                <Setter TargetName="PART_ButtonContent" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemTemplate, Mode=OneWay}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ContentTemplateSelector, Converter={x:Static converters:IsNullConverter.Instance}}" Value="True" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemTemplateSelector, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
+                </MultiDataTrigger.Conditions>
+                <Setter TargetName="PART_ButtonContent" Property="ContentTemplateSelector" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemTemplateSelector, Mode=OneWay}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ContentStringFormat, Converter={x:Static converters:IsNullConverter.Instance}}" Value="True" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemStringFormat, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
+                </MultiDataTrigger.Conditions>
+                <Setter TargetName="PART_ButtonContent" Property="ContentStringFormat" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemStringFormat, Mode=OneWay}" />
+            </MultiDataTrigger>
+        </ControlTemplate.Triggers>
     </ControlTemplate>
 
     <Style x:Key="ButtonDropDownFocusVisual">
@@ -232,8 +281,9 @@
                                                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                                                                Content="{Binding Content, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                                                ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                               ContentStringFormat="{TemplateBinding ItemStringFormat}"
-                                                               ContentTemplate="{TemplateBinding ItemTemplate}"
+                                                               ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                               ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                               ContentStringFormat="{TemplateBinding ContentStringFormat}"
                                                                RecognizesAccessKey="True"
                                                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                                                UseLayoutRounding="False" />
@@ -257,6 +307,28 @@
                         </Button>
                     </Border>
                     <ControlTemplate.Triggers>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ContentTemplate, Converter={x:Static converters:IsNullConverter.Instance}}" Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemTemplate, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_ButtonContent" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemTemplate, Mode=OneWay}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ContentTemplateSelector, Converter={x:Static converters:IsNullConverter.Instance}}" Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemTemplateSelector, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_ButtonContent" Property="ContentTemplateSelector" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemTemplateSelector, Mode=OneWay}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ContentStringFormat, Converter={x:Static converters:IsNullConverter.Instance}}" Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemStringFormat, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_ButtonContent" Property="ContentStringFormat" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemStringFormat, Mode=OneWay}" />
+                        </MultiDataTrigger>
+
                         <Trigger Property="Content" Value="{x:Null}">
                             <Setter TargetName="PART_ButtonContent" Property="Margin" Value="0" />
                         </Trigger>

From e4052554b2510470ba5a54002f0c4faf32442b32 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Fri, 8 Jul 2016 14:55:42 +0200
Subject: [PATCH 13/13] - set Placement for ContextMenu in DropDownButton style
 - add `protected virtual void SetContextMenuPlacementTarget(ContextMenu
 contextMenu)`

---
 MahApps.Metro/Controls/DropDownButton.cs | 13 ++++++++-----
 MahApps.Metro/Themes/DropDownButton.xaml |  5 ++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/MahApps.Metro/Controls/DropDownButton.cs b/MahApps.Metro/Controls/DropDownButton.cs
index a21ac55e6b..ef3e33310a 100644
--- a/MahApps.Metro/Controls/DropDownButton.cs
+++ b/MahApps.Metro/Controls/DropDownButton.cs
@@ -3,7 +3,6 @@
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Markup;
 using System.Windows.Media;
@@ -31,11 +30,15 @@ public event RoutedEventHandler Click
 
         private static void IsExpandedPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
         {
-            DropDownButton button = (DropDownButton)dependencyObject;
-            if (button.clickButton != null)
+            DropDownButton dropDownButton = (DropDownButton)dependencyObject;
+            dropDownButton.SetContextMenuPlacementTarget(dropDownButton.menu);
+        }
+
+        protected virtual void SetContextMenuPlacementTarget(ContextMenu contextMenu)
+        {
+            if (this.clickButton != null)
             {
-                button.menu.Placement = PlacementMode.Bottom;
-                button.menu.PlacementTarget = button.clickButton;
+                contextMenu.PlacementTarget = this.clickButton;
             }
         }
 
diff --git a/MahApps.Metro/Themes/DropDownButton.xaml b/MahApps.Metro/Themes/DropDownButton.xaml
index 0fcd119c88..e2b7f9aa78 100644
--- a/MahApps.Metro/Themes/DropDownButton.xaml
+++ b/MahApps.Metro/Themes/DropDownButton.xaml
@@ -59,6 +59,7 @@
                 </StackPanel>
                 <Button.ContextMenu>
                     <ContextMenu x:Name="PART_Menu"
+                                 Placement="Bottom"
                                  MinWidth="{TemplateBinding ActualWidth}"
                                  DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
                                  IsOpen="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
@@ -155,6 +156,7 @@
                 </StackPanel>
                 <Button.ContextMenu>
                     <ContextMenu x:Name="PART_Menu"
+                                 Placement="Bottom"
                                  MinWidth="{TemplateBinding ActualWidth}"
                                  DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
                                  IsOpen="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
@@ -291,6 +293,7 @@
                             </DockPanel>
                             <Button.ContextMenu>
                                 <ContextMenu x:Name="PART_Menu"
+                                             Placement="Bottom"
                                              MinWidth="{TemplateBinding ActualWidth}"
                                              Style="{TemplateBinding MenuStyle}"
                                              DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
@@ -328,7 +331,7 @@
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="PART_ButtonContent" Property="ContentStringFormat" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ItemStringFormat, Mode=OneWay}" />
                         </MultiDataTrigger>
-
+                        
                         <Trigger Property="Content" Value="{x:Null}">
                             <Setter TargetName="PART_ButtonContent" Property="Margin" Value="0" />
                         </Trigger>