From 5f90f4f0ddde352d2be44f41195d1ac78ce59d01 Mon Sep 17 00:00:00 2001
From: Aurel Hudec <hudec117@gmail.com>
Date: Sat, 5 May 2018 15:22:38 +0100
Subject: [PATCH 1/5] Fix for Track's height inside Slider.

---
 src/MahApps.Metro/Styles/FlatSlider.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MahApps.Metro/Styles/FlatSlider.xaml b/src/MahApps.Metro/Styles/FlatSlider.xaml
index 08680e71e9..9183ee12b1 100644
--- a/src/MahApps.Metro/Styles/FlatSlider.xaml
+++ b/src/MahApps.Metro/Styles/FlatSlider.xaml
@@ -84,7 +84,7 @@
                      Style="{DynamicResource MahApps.Metro.Styles.FlatSlider.TickBar}" />
             <Track x:Name="PART_Track"
                    Grid.Row="1"
-                   Height="{TemplateBinding Slider.MinHeight}">
+                   Height="{TemplateBinding Slider.Height}">
                 <Track.DecreaseRepeatButton>
                     <RepeatButton Background="{TemplateBinding Slider.Foreground}"
                                   Command="Slider.DecreaseLarge"

From 719e13f9bd05be13a9c7fdd09c0cf8e9533828bb Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 10 May 2018 17:35:59 +0200
Subject: [PATCH 2/5] (GH-3238) fix FlatSlider height usage (works now together
 with vertical and horizontal content alignement)

---
 src/MahApps.Metro/Styles/FlatSlider.xaml | 50 +++++++++---------------
 1 file changed, 18 insertions(+), 32 deletions(-)

diff --git a/src/MahApps.Metro/Styles/FlatSlider.xaml b/src/MahApps.Metro/Styles/FlatSlider.xaml
index 9183ee12b1..92698f457f 100644
--- a/src/MahApps.Metro/Styles/FlatSlider.xaml
+++ b/src/MahApps.Metro/Styles/FlatSlider.xaml
@@ -68,10 +68,10 @@
            TargetType="TickBar" />
 
     <ControlTemplate x:Key="MahApps.Metro.Styles.FlatSlider.HorizontalTemplate" TargetType="{x:Type Slider}">
-        <Grid>
+        <Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" MinHeight="{TemplateBinding Slider.MinHeight}" />
+                <RowDefinition Height="*" MinHeight="{TemplateBinding Slider.MinHeight}" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TickBar x:Name="TopTick"
@@ -82,18 +82,14 @@
                      Grid.Row="2"
                      Placement="Bottom"
                      Style="{DynamicResource MahApps.Metro.Styles.FlatSlider.TickBar}" />
-            <Track x:Name="PART_Track"
-                   Grid.Row="1"
-                   Height="{TemplateBinding Slider.Height}">
+            <Track x:Name="PART_Track" Grid.Row="1">
                 <Track.DecreaseRepeatButton>
                     <RepeatButton Background="{TemplateBinding Slider.Foreground}"
                                   Command="Slider.DecreaseLarge"
                                   Style="{DynamicResource MahApps.Metro.Styles.FlatSlider.Track}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <controls:MetroThumb Width="{TemplateBinding Slider.MinHeight}"
-                                         Background="{TemplateBinding Slider.BorderBrush}"
-                                         Style="{DynamicResource MahApps.Metro.Styles.FlatSlider.Thumb}" />
+                    <controls:MetroThumb Background="{TemplateBinding Slider.BorderBrush}" Style="{DynamicResource MahApps.Metro.Styles.FlatSlider.Thumb}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton Background="{TemplateBinding Slider.Background}"
@@ -118,10 +114,10 @@
 
     <!--  obsolete  -->
     <ControlTemplate x:Key="HorizontalSlider" TargetType="{x:Type Slider}">
-        <Grid>
+        <Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" MinHeight="{TemplateBinding Slider.MinHeight}" />
+                <RowDefinition Height="*" MinHeight="{TemplateBinding Slider.MinHeight}" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TickBar x:Name="TopTick"
@@ -132,18 +128,14 @@
                      Grid.Row="2"
                      Placement="Bottom"
                      Style="{StaticResource SliderTickBarStyle}" />
-            <Track x:Name="PART_Track"
-                   Grid.Row="1"
-                   Height="{TemplateBinding Slider.MinHeight}">
+            <Track x:Name="PART_Track" Grid.Row="1">
                 <Track.DecreaseRepeatButton>
                     <RepeatButton Background="{TemplateBinding Slider.Foreground}"
                                   Command="Slider.DecreaseLarge"
                                   Style="{StaticResource SliderButtonStyle}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <controls:MetroThumb Width="{TemplateBinding Slider.MinHeight}"
-                                         Background="{TemplateBinding Slider.BorderBrush}"
-                                         Style="{StaticResource SliderThumbStyle}" />
+                    <controls:MetroThumb Background="{TemplateBinding Slider.BorderBrush}" Style="{StaticResource SliderThumbStyle}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton Background="{TemplateBinding Slider.Background}"
@@ -167,10 +159,10 @@
     </ControlTemplate>
 
     <ControlTemplate x:Key="MahApps.Metro.Styles.FlatSlider.VerticalTemplate" TargetType="{x:Type Slider}">
-        <Grid>
+        <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" MinWidth="{TemplateBinding Slider.MinWidth}" />
+                <ColumnDefinition Width="*" MinWidth="{TemplateBinding Slider.MinWidth}" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <TickBar x:Name="TopTick"
@@ -181,18 +173,14 @@
                      Grid.Column="2"
                      Placement="Right"
                      Style="{DynamicResource MahApps.Metro.Styles.FlatSlider.TickBar}" />
-            <Track x:Name="PART_Track"
-                   Grid.Column="1"
-                   Width="{TemplateBinding Slider.MinWidth}">
+            <Track x:Name="PART_Track" Grid.Column="1">
                 <Track.DecreaseRepeatButton>
                     <RepeatButton Background="{TemplateBinding Slider.Foreground}"
                                   Command="Slider.DecreaseLarge"
                                   Style="{DynamicResource MahApps.Metro.Styles.FlatSlider.Track}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <controls:MetroThumb Height="{TemplateBinding Slider.MinWidth}"
-                                         Background="{TemplateBinding Slider.BorderBrush}"
-                                         Style="{DynamicResource MahApps.Metro.Styles.FlatSlider.Thumb}" />
+                    <controls:MetroThumb Background="{TemplateBinding Slider.BorderBrush}" Style="{DynamicResource MahApps.Metro.Styles.FlatSlider.Thumb}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton Background="{TemplateBinding Slider.Background}"
@@ -217,10 +205,10 @@
 
     <!--  obsolete  -->
     <ControlTemplate x:Key="VerticalSlider" TargetType="{x:Type Slider}">
-        <Grid>
+        <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" MinWidth="{TemplateBinding Slider.MinWidth}" />
+                <ColumnDefinition Width="*" MinWidth="{TemplateBinding Slider.MinWidth}" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <TickBar x:Name="TopTick"
@@ -231,18 +219,14 @@
                      Grid.Column="2"
                      Placement="Right"
                      Style="{StaticResource SliderTickBarStyle}" />
-            <Track x:Name="PART_Track"
-                   Grid.Column="1"
-                   Width="{TemplateBinding Slider.MinWidth}">
+            <Track x:Name="PART_Track" Grid.Column="1">
                 <Track.DecreaseRepeatButton>
                     <RepeatButton Background="{TemplateBinding Slider.Foreground}"
                                   Command="Slider.DecreaseLarge"
                                   Style="{StaticResource SliderButtonStyle}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <controls:MetroThumb Height="{TemplateBinding Slider.MinWidth}"
-                                         Background="{TemplateBinding Slider.BorderBrush}"
-                                         Style="{StaticResource SliderThumbStyle}" />
+                    <controls:MetroThumb Background="{TemplateBinding Slider.BorderBrush}" Style="{StaticResource SliderThumbStyle}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton Background="{TemplateBinding Slider.Background}"
@@ -269,12 +253,14 @@
         <Setter Property="Background" Value="{DynamicResource SliderTrackNormal}" />
         <Setter Property="BorderBrush" Value="{DynamicResource BlackBrush}" />
         <Setter Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="Maximum" Value="100" />
         <Setter Property="Minimum" Value="0" />
         <Setter Property="Orientation" Value="Horizontal" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Value" Value="0" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Style.Triggers>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter Property="Background" Value="{DynamicResource SliderTrackDisabled}" />

From d2d09eb2941a1937a628cd9f6d1af1fa96d332b7 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 10 May 2018 17:37:45 +0200
Subject: [PATCH 3/5] (GH-3238) fix Slider and RangeSlider height usage too
 (works now together with vertical and horizontal content alignement)

---
 src/MahApps.Metro/Styles/Controls.Slider.xaml | 28 +++++++++++++------
 src/MahApps.Metro/Themes/RangeSlider.xaml     | 28 +++++++++++++------
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Controls.Slider.xaml b/src/MahApps.Metro/Styles/Controls.Slider.xaml
index 9219be1141..cfedf8f14e 100644
--- a/src/MahApps.Metro/Styles/Controls.Slider.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Slider.xaml
@@ -85,10 +85,12 @@
 
     <!--  HorizontalSlider  -->
     <ControlTemplate x:Key="MahApps.Metro.Styles.Slider.HorizontalTemplate" TargetType="{x:Type Slider}">
-        <Grid x:Name="HorizontalTemplate" Background="{TemplateBinding Background}">
+        <Grid x:Name="HorizontalTemplate"
+              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+              Background="{TemplateBinding Background}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" MinHeight="{TemplateBinding Slider.MinHeight}" />
+                <RowDefinition Height="*" MinHeight="{TemplateBinding Slider.MinHeight}" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TickBar x:Name="TopTick"
@@ -169,10 +171,12 @@
 
     <!--  VerticalSlider  -->
     <ControlTemplate x:Key="MahApps.Metro.Styles.Slider.VerticalTemplate" TargetType="{x:Type Slider}">
-        <Grid x:Name="HorizontalTemplate" Background="{TemplateBinding Background}">
+        <Grid x:Name="HorizontalTemplate"
+              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+              Background="{TemplateBinding Background}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" MinWidth="{TemplateBinding Slider.MinWidth}" />
+                <ColumnDefinition Width="*" MinWidth="{TemplateBinding Slider.MinWidth}" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <TickBar x:Name="TopTick"
@@ -268,10 +272,12 @@
         <Setter Property="Controls:SliderHelper.TrackValueFillHoverBrush" Value="{DynamicResource AccentColorBrush}" />
         <Setter Property="Controls:SliderHelper.TrackValueFillPressedBrush" Value="{DynamicResource AccentColorBrush}" />
         <Setter Property="Foreground" Value="{DynamicResource GrayBrush1}" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="Maximum" Value="100" />
         <Setter Property="Minimum" Value="0" />
         <Setter Property="Template" Value="{DynamicResource MahApps.Metro.Styles.Slider.HorizontalTemplate}" />
         <Setter Property="Value" Value="0" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Vertical">
                 <Setter Property="Template" Value="{DynamicResource MahApps.Metro.Styles.Slider.VerticalTemplate}" />
@@ -616,10 +622,12 @@
 
     <!--  HorizontalSlider  -->
     <ControlTemplate x:Key="MahApps.Metro.Styles.Slider.HorizontalTemplate.Win10" TargetType="{x:Type Slider}">
-        <Grid x:Name="HorizontalTemplate" Background="{TemplateBinding Background}">
+        <Grid x:Name="HorizontalTemplate"
+              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+              Background="{TemplateBinding Background}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" MinHeight="{TemplateBinding Slider.MinHeight}" />
+                <RowDefinition Height="*" MinHeight="{TemplateBinding Slider.MinHeight}" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TickBar x:Name="TopTick"
@@ -701,10 +709,12 @@
 
     <!--  VerticalSlider  -->
     <ControlTemplate x:Key="MahApps.Metro.Styles.Slider.VerticalTemplate.Win10" TargetType="{x:Type Slider}">
-        <Grid x:Name="HorizontalTemplate" Background="{TemplateBinding Background}">
+        <Grid x:Name="HorizontalTemplate"
+              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+              Background="{TemplateBinding Background}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" MinWidth="{TemplateBinding Slider.MinWidth}" />
+                <ColumnDefinition Width="*" MinWidth="{TemplateBinding Slider.MinWidth}" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <TickBar x:Name="TopTick"
@@ -801,11 +811,13 @@
         <Setter Property="Controls:SliderHelper.TrackValueFillHoverBrush" Value="{DynamicResource AccentBaseColorBrush}" />
         <Setter Property="Controls:SliderHelper.TrackValueFillPressedBrush" Value="{DynamicResource AccentBaseColorBrush}" />
         <Setter Property="Foreground" Value="{DynamicResource GrayBrush2}" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="IsMoveToPointEnabled" Value="True" />
         <Setter Property="Maximum" Value="100" />
         <Setter Property="Minimum" Value="0" />
         <Setter Property="Template" Value="{DynamicResource MahApps.Metro.Styles.Slider.HorizontalTemplate.Win10}" />
         <Setter Property="Value" Value="0" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Vertical">
                 <Setter Property="Template" Value="{DynamicResource MahApps.Metro.Styles.Slider.VerticalTemplate.Win10}" />
diff --git a/src/MahApps.Metro/Themes/RangeSlider.xaml b/src/MahApps.Metro/Themes/RangeSlider.xaml
index 1e54b50cd6..4a1fda46c4 100644
--- a/src/MahApps.Metro/Themes/RangeSlider.xaml
+++ b/src/MahApps.Metro/Themes/RangeSlider.xaml
@@ -33,10 +33,12 @@
     </Style>
 
     <ControlTemplate x:Key="MahApps.Metro.Styles.RangeSlider.HorizontalTemplate" TargetType="{x:Type Controls:RangeSlider}">
-        <Grid x:Name="PART_Container" Background="{TemplateBinding Background}">
+        <Grid x:Name="PART_Container"
+              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+              Background="{TemplateBinding Background}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" MinHeight="{TemplateBinding Controls:RangeSlider.MinHeight}" />
+                <RowDefinition Height="*" MinHeight="{TemplateBinding Controls:RangeSlider.MinHeight}" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TickBar x:Name="PART_TopTick"
@@ -151,10 +153,12 @@
     </ControlTemplate>
 
     <ControlTemplate x:Key="MahApps.Metro.Styles.RangeSlider.VerticalTemplate" TargetType="{x:Type Controls:RangeSlider}">
-        <Grid x:Name="PART_Container" Background="{TemplateBinding Background}">
+        <Grid x:Name="PART_Container"
+              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+              Background="{TemplateBinding Background}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" MinWidth="{TemplateBinding Controls:RangeSlider.MinWidth}" />
+                <ColumnDefinition Width="*" MinWidth="{TemplateBinding Controls:RangeSlider.MinWidth}" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <TickBar x:Name="PART_TopTick"
@@ -283,7 +287,9 @@
         <Setter Property="Controls:SliderHelper.TrackValueFillHoverBrush" Value="{DynamicResource AccentColorBrush}" />
         <Setter Property="Controls:SliderHelper.TrackValueFillPressedBrush" Value="{DynamicResource AccentColorBrush}" />
         <Setter Property="Foreground" Value="{DynamicResource GrayBrush1}" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="Template" Value="{StaticResource MahApps.Metro.Styles.RangeSlider.HorizontalTemplate}" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Vertical">
                 <Setter Property="Template" Value="{StaticResource MahApps.Metro.Styles.RangeSlider.VerticalTemplate}" />
@@ -324,10 +330,12 @@
     </Style>
 
     <ControlTemplate x:Key="MahApps.Metro.Styles.RangeSlider.HorizontalTemplate.Win10" TargetType="{x:Type Controls:RangeSlider}">
-        <Grid x:Name="PART_Container" Background="{TemplateBinding Background}">
+        <Grid x:Name="PART_Container"
+              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+              Background="{TemplateBinding Background}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" MinHeight="{TemplateBinding Controls:RangeSlider.MinHeight}" />
+                <RowDefinition Height="*" MinHeight="{TemplateBinding Controls:RangeSlider.MinHeight}" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TickBar x:Name="PART_TopTick"
@@ -457,10 +465,12 @@
     </ControlTemplate>
 
     <ControlTemplate x:Key="MahApps.Metro.Styles.RangeSlider.VerticalTemplate.Win10" TargetType="{x:Type Controls:RangeSlider}">
-        <Grid x:Name="PART_Container" Background="{TemplateBinding Background}">
+        <Grid x:Name="PART_Container"
+              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+              Background="{TemplateBinding Background}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" MinWidth="{TemplateBinding Controls:RangeSlider.MinWidth}" />
+                <ColumnDefinition Width="*" MinWidth="{TemplateBinding Controls:RangeSlider.MinWidth}" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <TickBar x:Name="PART_TopTick"
@@ -604,8 +614,10 @@
         <Setter Property="Controls:SliderHelper.TrackValueFillHoverBrush" Value="{DynamicResource AccentBaseColorBrush}" />
         <Setter Property="Controls:SliderHelper.TrackValueFillPressedBrush" Value="{DynamicResource AccentBaseColorBrush}" />
         <Setter Property="Foreground" Value="{DynamicResource GrayBrush2}" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="IsMoveToPointEnabled" Value="True" />
         <Setter Property="Template" Value="{StaticResource MahApps.Metro.Styles.RangeSlider.HorizontalTemplate.Win10}" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Vertical">
                 <Setter Property="Template" Value="{StaticResource MahApps.Metro.Styles.RangeSlider.VerticalTemplate.Win10}" />

From b2e86a1eb0080684007064108413cd834ecd2180 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Fri, 11 May 2018 12:35:44 +0200
Subject: [PATCH 4/5] (GH-3244) Left-/ RightWindowCommands no more visible when
 ShowTitleBar is False   This feature will be there, but the window commands
 can now be used again to bring these back

---
 .../ExampleWindows/FlyoutDemo.xaml            | 23 +++++++++++--------
 src/MahApps.Metro/Controls/MetroWindow.cs     | 20 ++++++++--------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
index 29d1796573..bc4d75a32f 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
@@ -28,12 +28,13 @@
     <Window.Resources>
         <ResourceDictionary>
 
-            <x:Array x:Key="WindowCommandsOverlayBehaviorArray" Type="Controls:WindowCommandsOverlayBehavior">
-                <Controls:WindowCommandsOverlayBehavior>Always</Controls:WindowCommandsOverlayBehavior>
-                <Controls:WindowCommandsOverlayBehavior>Flyouts</Controls:WindowCommandsOverlayBehavior>
-                <Controls:WindowCommandsOverlayBehavior>HiddenTitleBar</Controls:WindowCommandsOverlayBehavior>
-                <Controls:WindowCommandsOverlayBehavior>Never</Controls:WindowCommandsOverlayBehavior>
-            </x:Array>
+            <ObjectDataProvider x:Key="WindowCommandsOverlayBehaviorValues"
+                                MethodName="GetValues"
+                                ObjectType="{x:Type Controls:WindowCommandsOverlayBehavior}">
+                <ObjectDataProvider.MethodParameters>
+                    <x:Type TypeName="Controls:WindowCommandsOverlayBehavior" />
+                </ObjectDataProvider.MethodParameters>
+            </ObjectDataProvider>
 
         </ResourceDictionary>
     </Window.Resources>
@@ -445,7 +446,7 @@
                           Width="100"
                           Margin="2"
                           VerticalAlignment="Center"
-                          ItemsSource="{StaticResource WindowCommandsOverlayBehaviorArray}"
+                          ItemsSource="{Binding Source={StaticResource WindowCommandsOverlayBehaviorValues}}"
                           SelectedValue="{Binding ElementName=flyoutsDemo, Path=LeftWindowCommandsOverlayBehavior}" />
             </Grid>
 
@@ -462,7 +463,7 @@
                           Width="100"
                           Margin="2"
                           VerticalAlignment="Center"
-                          ItemsSource="{StaticResource WindowCommandsOverlayBehaviorArray}"
+                          ItemsSource="{Binding Source={StaticResource WindowCommandsOverlayBehaviorValues}}"
                           SelectedValue="{Binding ElementName=flyoutsDemo, Path=RightWindowCommandsOverlayBehavior}" />
             </Grid>
 
@@ -479,7 +480,7 @@
                           Width="100"
                           Margin="2"
                           VerticalAlignment="Center"
-                          ItemsSource="{StaticResource WindowCommandsOverlayBehaviorArray}"
+                          ItemsSource="{Binding Source={StaticResource WindowCommandsOverlayBehaviorValues}}"
                           SelectedValue="{Binding ElementName=flyoutsDemo, Path=WindowButtonCommandsOverlayBehavior}" />
             </Grid>
 
@@ -496,10 +497,12 @@
                           Width="100"
                           Margin="2"
                           VerticalAlignment="Center"
-                          ItemsSource="{StaticResource WindowCommandsOverlayBehaviorArray}"
+                          ItemsSource="{Binding Source={StaticResource WindowCommandsOverlayBehaviorValues}}"
                           SelectedValue="{Binding ElementName=flyoutsDemo, Path=IconOverlayBehavior}" />
             </Grid>
 
+            <CheckBox Content="ShowTitleBar" IsChecked="{Binding ElementName=flyoutsDemo, Path=ShowTitleBar, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
             <Button Margin="2 10 2 2"
                     Click="ShowLeft"
                     Content="Show Left" />
diff --git a/src/MahApps.Metro/Controls/MetroWindow.cs b/src/MahApps.Metro/Controls/MetroWindow.cs
index ec78424352..019a2c8f47 100644
--- a/src/MahApps.Metro/Controls/MetroWindow.cs
+++ b/src/MahApps.Metro/Controls/MetroWindow.cs
@@ -124,10 +124,10 @@ public class MetroWindow : Window
         public static readonly DependencyProperty RightWindowCommandsProperty = DependencyProperty.Register("RightWindowCommands", typeof(WindowCommands), typeof(MetroWindow), new PropertyMetadata(null, UpdateLogicalChilds));
         public static readonly DependencyProperty WindowButtonCommandsProperty = DependencyProperty.Register("WindowButtonCommands", typeof(WindowButtonCommands), typeof(MetroWindow), new PropertyMetadata(null, UpdateLogicalChilds));
 
-        public static readonly DependencyProperty LeftWindowCommandsOverlayBehaviorProperty = DependencyProperty.Register("LeftWindowCommandsOverlayBehavior", typeof(WindowCommandsOverlayBehavior), typeof(MetroWindow), new PropertyMetadata(WindowCommandsOverlayBehavior.Flyouts));
-        public static readonly DependencyProperty RightWindowCommandsOverlayBehaviorProperty = DependencyProperty.Register("RightWindowCommandsOverlayBehavior", typeof(WindowCommandsOverlayBehavior), typeof(MetroWindow), new PropertyMetadata(WindowCommandsOverlayBehavior.Flyouts));
-        public static readonly DependencyProperty WindowButtonCommandsOverlayBehaviorProperty = DependencyProperty.Register("WindowButtonCommandsOverlayBehavior", typeof(WindowCommandsOverlayBehavior), typeof(MetroWindow), new PropertyMetadata(WindowCommandsOverlayBehavior.Always));
-        public static readonly DependencyProperty IconOverlayBehaviorProperty = DependencyProperty.Register("IconOverlayBehavior", typeof(WindowCommandsOverlayBehavior), typeof(MetroWindow), new PropertyMetadata(WindowCommandsOverlayBehavior.Never));
+        public static readonly DependencyProperty LeftWindowCommandsOverlayBehaviorProperty = DependencyProperty.Register("LeftWindowCommandsOverlayBehavior", typeof(WindowCommandsOverlayBehavior), typeof(MetroWindow), new PropertyMetadata(WindowCommandsOverlayBehavior.Flyouts, OnShowTitleBarPropertyChangedCallback));
+        public static readonly DependencyProperty RightWindowCommandsOverlayBehaviorProperty = DependencyProperty.Register("RightWindowCommandsOverlayBehavior", typeof(WindowCommandsOverlayBehavior), typeof(MetroWindow), new PropertyMetadata(WindowCommandsOverlayBehavior.Flyouts, OnShowTitleBarPropertyChangedCallback));
+        public static readonly DependencyProperty WindowButtonCommandsOverlayBehaviorProperty = DependencyProperty.Register("WindowButtonCommandsOverlayBehavior", typeof(WindowCommandsOverlayBehavior), typeof(MetroWindow), new PropertyMetadata(WindowCommandsOverlayBehavior.Always, OnShowTitleBarPropertyChangedCallback));
+        public static readonly DependencyProperty IconOverlayBehaviorProperty = DependencyProperty.Register("IconOverlayBehavior", typeof(WindowCommandsOverlayBehavior), typeof(MetroWindow), new PropertyMetadata(WindowCommandsOverlayBehavior.Never, OnShowTitleBarPropertyChangedCallback));
 
         [Obsolete(@"This property will be deleted in the next release. You should use LightMinButtonStyle or DarkMinButtonStyle in WindowButtonCommands to override the style.")]
         public static readonly DependencyProperty WindowMinButtonStyleProperty = DependencyProperty.Register("WindowMinButtonStyle", typeof(Style), typeof(MetroWindow), new PropertyMetadata(null, OnWindowButtonStyleChanged));
@@ -621,14 +621,14 @@ private void SetVisibiltyForAllTitleElements()
             this.titleBar?.SetCurrentValue(VisibilityProperty, newVisibility);
             this.titleBarBackground?.SetCurrentValue(VisibilityProperty, newVisibility);
 
-            newVisibility = this.LeftWindowCommandsOverlayBehavior.HasFlag(WindowCommandsOverlayBehavior.HiddenTitleBar) && !this.UseNoneWindowStyle ? Visibility.Visible : newVisibility;
-            this.LeftWindowCommandsPresenter?.SetCurrentValue(VisibilityProperty, newVisibility);
+            var leftWindowCommandsVisibility = this.LeftWindowCommandsOverlayBehavior.HasFlag(WindowCommandsOverlayBehavior.HiddenTitleBar) && !this.UseNoneWindowStyle ? Visibility.Visible : newVisibility;
+            this.LeftWindowCommandsPresenter?.SetCurrentValue(VisibilityProperty, leftWindowCommandsVisibility);
 
-            newVisibility = this.RightWindowCommandsOverlayBehavior.HasFlag(WindowCommandsOverlayBehavior.HiddenTitleBar) && !this.UseNoneWindowStyle ? Visibility.Visible : newVisibility;
-            this.RightWindowCommandsPresenter?.SetCurrentValue(VisibilityProperty, newVisibility);
+            var rightWindowCommandsVisibility = this.RightWindowCommandsOverlayBehavior.HasFlag(WindowCommandsOverlayBehavior.HiddenTitleBar) && !this.UseNoneWindowStyle ? Visibility.Visible : newVisibility;
+            this.RightWindowCommandsPresenter?.SetCurrentValue(VisibilityProperty, rightWindowCommandsVisibility);
 
-            newVisibility = this.WindowButtonCommandsOverlayBehavior.HasFlag(WindowCommandsOverlayBehavior.HiddenTitleBar) ? Visibility.Visible : newVisibility;
-            this.WindowButtonCommandsPresenter?.SetCurrentValue(VisibilityProperty, newVisibility);
+            var windowButtonCommandsVisibility = this.WindowButtonCommandsOverlayBehavior.HasFlag(WindowCommandsOverlayBehavior.HiddenTitleBar) ? Visibility.Visible : newVisibility;
+            this.WindowButtonCommandsPresenter?.SetCurrentValue(VisibilityProperty, windowButtonCommandsVisibility);
 
             this.SetWindowEvents();
         }

From 4f00119ff64f608b026a61cf809252c53aa5a870 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Fri, 11 May 2018 22:51:03 +0200
Subject: [PATCH 5/5] docs: added backers and sponsors from Open Collective

---
 readme.md | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 84 insertions(+), 4 deletions(-)

diff --git a/readme.md b/readme.md
index 2ed3da6380..a8b3f53fe1 100644
--- a/readme.md
+++ b/readme.md
@@ -50,10 +50,6 @@
   </a>
 </div>
 
-<h2>Want to say thanks?</h2>
-
-This framework is free and can be used for free, open source and commercial applications. It's tested and contributed by many people... So mainly hit the :star: button, that's all... thx :squirrel: (:dollar:, :euro:, :beer: or some other gifts are also being accepted...).
-
 <h2>Let's get started</h2>
 
 - [Documentation](https://github.com/MahApps/MahApps.Metro/wiki/Documentation)
@@ -90,6 +86,90 @@ We use these awesome tools to build and develop MahApps.Metro.
   </a>
 </div>
 
+<h2>Sponsorship</h2>
+
+This framework is free and can be used for free, open source and commercial applications. It's tested and contributed by many people... So mainly hit the :star: button... thx :squirrel: (:dollar:, :euro:, :beer: or some other gifts are also being accepted :-D ).
+
+The core team members, MahApps.Metro contributors and contributors in the ecosystem do this open source work in their free time. If you use MahApps.Metro a serious task, and you'd like us to invest more time on it, please donate. This project increases your income/productivity/usabilty too.
+
+This is how we use the donations:
+
+* Allow the core team to work on MahApps.Metro
+* Thank contributors if they invested a large amount of time in contributing
+* Support projects in the ecosystem that are of great value for users
+* Infrastructure cost
+* Fees for money handling
+
+<h2>Backers</h2>
+
+[Become a backer](https://opencollective.com/mahappsmetro#backer) and get your image on our README on Github with a link to your site.
+
+<a href="https://opencollective.com/mahappsmetro/backer/0/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/0/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/1/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/1/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/2/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/2/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/3/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/3/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/4/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/4/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/5/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/5/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/6/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/6/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/7/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/7/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/8/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/8/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/9/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/9/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/10/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/10/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/11/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/11/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/12/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/12/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/13/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/13/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/14/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/14/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/15/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/15/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/16/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/16/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/17/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/17/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/18/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/18/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/19/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/19/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/20/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/20/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/21/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/21/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/22/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/22/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/23/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/23/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/24/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/24/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/25/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/25/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/26/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/26/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/27/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/27/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/28/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/28/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/backer/29/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/backer/29/avatar.svg"></a>
+
+<h2>Sponsors</h2>
+
+[Become a sponsor](https://opencollective.com/mahappsmetro#sponsor) and get your logo on our README on Github with a link to your site.
+
+<a href="https://opencollective.com/mahappsmetro/sponsor/0/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/1/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/2/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/3/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/4/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/5/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/6/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/7/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/8/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/9/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/9/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/10/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/10/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/11/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/11/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/12/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/12/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/13/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/13/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/14/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/14/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/15/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/15/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/16/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/16/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/17/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/17/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/18/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/18/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/19/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/19/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/20/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/20/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/21/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/21/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/22/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/22/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/23/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/23/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/24/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/24/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/25/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/25/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/26/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/26/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/27/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/27/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/28/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/28/avatar.svg"></a>
+<a href="https://opencollective.com/mahappsmetro/sponsor/29/website" target="_blank"><img src="https://opencollective.com/mahappsmetro/sponsor/29/avatar.svg"></a>
+
 <h2>Screenshots</h2>
 
 <div align="center">