From 1b5cfbfaaa5ba5c0a76f1a9c78775799e0a84874 Mon Sep 17 00:00:00 2001
From: Zach Saunders <Zach.Saunders@brewers.com>
Date: Thu, 11 May 2017 13:11:52 -0500
Subject: [PATCH 01/10] Added ComboDataGrid Control

---
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../MahApps.Metro.Demo.NET40.csproj           |   2 +-
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../ExampleViews/SelectionExamples.xaml       |  56 ++
 .../Controls/ComboDataGrid.cs                 |  74 ++
 .../MahApps.Metro.Shared.projitems            |   1 +
 .../MahApps.Metro/MahApps.Metro.NET40.csproj  |   4 +
 .../MahApps.Metro/MahApps.Metro.NET45.csproj  |   4 +
 .../MahApps.Metro/Properties/AssemblyInfo.cs  |   6 +-
 .../Styles/Controls.ComboBox.xaml             | 458 ++++++++----
 .../MahApps.Metro/Themes/ComboDataGrid.xaml   | 688 ++++++++++++++++++
 .../MahApps.Metro/Themes/Generic.xaml         |   1 +
 .../Properties/AssemblyInfo.cs                |   4 +-
 15 files changed, 1163 insertions(+), 151 deletions(-)
 create mode 100644 src/MahApps.Metro/MahApps.Metro.Shared/Controls/ComboDataGrid.cs
 create mode 100644 src/MahApps.Metro/MahApps.Metro/Themes/ComboDataGrid.xaml

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET40/Properties/AssemblyInfo.cs b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET40/Properties/AssemblyInfo.cs
index 846bd45942..3bd85e2e47 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET40/Properties/AssemblyInfo.cs
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET40/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.2017.5")]
+[assembly: AssemblyFileVersion("1.0.2017.5")]
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET45/Properties/AssemblyInfo.cs b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET45/Properties/AssemblyInfo.cs
index 98c982d8d3..90e75c69da 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET45/Properties/AssemblyInfo.cs
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET45/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.2017.10")]
+[assembly: AssemblyFileVersion("1.0.2017.10")]
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/MahApps.Metro.Demo.NET40.csproj b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/MahApps.Metro.Demo.NET40.csproj
index fb3ac82a15..342e33e62d 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/MahApps.Metro.Demo.NET40.csproj
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/MahApps.Metro.Demo.NET40.csproj
@@ -143,7 +143,7 @@
   </Target>
   -->
   <Target AfterTargets="AfterBuild;NonWinFodyTarget" Name="CleanReferenceCopyLocalPaths" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Delete Files="@(ReferenceCopyLocalPaths-&gt;'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
+    <Delete Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
   </Target>
   <Import Project="..\..\..\.paket\paket.targets" />
   <Choose>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/Properties/AssemblyInfo.cs b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/Properties/AssemblyInfo.cs
index 603603bce4..13b671dfd4 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/Properties/AssemblyInfo.cs
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.2017.6")]
+[assembly: AssemblyFileVersion("1.0.2017.6")]
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET45/Properties/AssemblyInfo.cs b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET45/Properties/AssemblyInfo.cs
index f5f620c8ee..acb487ec8c 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET45/Properties/AssemblyInfo.cs
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET45/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.2017.20")]
+[assembly: AssemblyFileVersion("1.0.2017.20")]
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/SelectionExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/SelectionExamples.xaml
index f31b5faaf7..5eb43a4b12 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/SelectionExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/SelectionExamples.xaml
@@ -209,6 +209,62 @@
                           Text="{Binding Path=Title, Mode=TwoWay}" />
             </StackPanel>
         </TabItem>
+        <TabItem Header="ComboDataGrid"
+                 VerticalAlignment="Bottom">
+            <StackPanel HorizontalAlignment="Left"
+                        Orientation="Vertical">
+                <Controls:ComboDataGrid ItemsSource="{Binding Artists}"
+                                        DisplayMemberPath="Name"
+                                        AutoGenerateColumns="False"
+                                        Margin="5"
+                                        Width="200"
+                                        Controls:TextBoxHelper.ClearTextButton="True"
+                                        Controls:TextBoxHelper.Watermark="Please select an item...">
+                    <Controls:ComboDataGrid.Columns>
+                        <DataGridTextColumn Header="ID"
+                                            Binding="{Binding ArtistId}" />
+                        <DataGridTextColumn Header="Name"
+                                            Binding="{Binding Name}" />
+                    </Controls:ComboDataGrid.Columns>
+                </Controls:ComboDataGrid>
+                <Controls:ComboDataGrid ItemsSource="{Binding Artists}"
+                                        DisplayMemberPath="Name"
+                                        AutoGenerateColumns="True"
+                                        Margin="5"
+                                        Width="200" />
+
+                <Controls:ComboDataGrid ItemsSource="{Binding Artists}"
+                                        DisplayMemberPath="Name"
+                                        AutoGenerateColumns="False"
+                                        Margin="5"
+                                        Width="200"
+                                        IsEditable="True"
+                                        Controls:TextBoxHelper.UseFloatingWatermark="True"
+                                        Controls:TextBoxHelper.Watermark="Please select an item...">
+                    <Controls:ComboDataGrid.Columns>
+                        <DataGridTextColumn Header="ID"
+                                            Binding="{Binding ArtistId}" />
+                        <DataGridTextColumn Header="Name"
+                                            Binding="{Binding Name}" />
+                    </Controls:ComboDataGrid.Columns>
+                </Controls:ComboDataGrid>
+                <Controls:ComboDataGrid ItemsSource="{Binding Artists}"
+                                        DisplayMemberPath="Name"
+                                        AutoGenerateColumns="False"
+                                        Margin="5"
+                                        Width="200"
+                                        IsEnabled="False"
+                                        Controls:TextBoxHelper.UseFloatingWatermark="True"
+                                        SelectedIndex="0">
+                    <Controls:ComboDataGrid.Columns>
+                        <DataGridTextColumn Header="ID"
+                                            Binding="{Binding ArtistId}" />
+                        <DataGridTextColumn Header="Name"
+                                            Binding="{Binding Name}" />
+                    </Controls:ComboDataGrid.Columns>
+                </Controls:ComboDataGrid>
+            </StackPanel>
+        </TabItem>
     </TabControl>
 
 </UserControl>
diff --git a/src/MahApps.Metro/MahApps.Metro.Shared/Controls/ComboDataGrid.cs b/src/MahApps.Metro/MahApps.Metro.Shared/Controls/ComboDataGrid.cs
new file mode 100644
index 0000000000..c12786304a
--- /dev/null
+++ b/src/MahApps.Metro/MahApps.Metro.Shared/Controls/ComboDataGrid.cs
@@ -0,0 +1,74 @@
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace MahApps.Metro.Controls
+{
+    [TemplatePart(Name = "PART_DataGrid", Type = typeof(DataGrid))]
+    public class ComboDataGrid : ComboBox
+    {
+        private readonly ObservableCollection<DataGridColumn> columns;
+        private DataGrid dataGrid;
+
+        static ComboDataGrid()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(ComboDataGrid), new FrameworkPropertyMetadata(typeof(ComboDataGrid)));
+        }
+
+        public ComboDataGrid()
+        {
+            this.columns = new ObservableCollection<DataGridColumn>();
+            this.columns.CollectionChanged += this.OnColumnsCollectionChanged;
+        }
+
+        public static readonly DependencyProperty AutoGenerateColumnsProperty = DependencyProperty.Register("AutoGenerateColumns", typeof(bool), typeof(ComboDataGrid), new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
+
+        public bool AutoGenerateColumns
+        {
+            get { return (bool)GetValue(AutoGenerateColumnsProperty); }
+            set { SetValue(AutoGenerateColumnsProperty, value); }
+        }
+
+        public ObservableCollection<DataGridColumn> Columns
+        {
+            get { return this.columns; }
+        }
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+            this.dataGrid = (DataGrid)this.GetTemplateChild("PART_DataGrid");
+            if (dataGrid == null)
+            {
+                return;
+            }
+            this.dataGrid.MouseLeftButtonUp += this.OnDataGridMouseLeftButtonUp;
+            this.UpdateDataGridColumns();
+        }
+
+        private void OnColumnsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (this.dataGrid != null)
+            {
+                this.UpdateDataGridColumns();
+            }
+        }
+
+        private void OnDataGridMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            this.IsDropDownOpen = false;
+        }
+
+        private void UpdateDataGridColumns()
+        {
+            this.dataGrid.Columns.Clear();
+            foreach (DataGridColumn column in this.Columns)
+            {
+                column.IsReadOnly = true;
+                this.dataGrid.Columns.Add(column);
+            }
+        }
+    }
+}
diff --git a/src/MahApps.Metro/MahApps.Metro.Shared/MahApps.Metro.Shared.projitems b/src/MahApps.Metro/MahApps.Metro.Shared/MahApps.Metro.Shared.projitems
index 9be12e76e3..bfa31fa729 100644
--- a/src/MahApps.Metro/MahApps.Metro.Shared/MahApps.Metro.Shared.projitems
+++ b/src/MahApps.Metro/MahApps.Metro.Shared/MahApps.Metro.Shared.projitems
@@ -25,6 +25,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ButtonsAlignment.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\CloseCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ClosingWindowEventHandlerArgs.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\ComboDataGrid.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ContentControlEx.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\CustomValidationPopup.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\DataGridNumericUpDownColumn.cs" />
diff --git a/src/MahApps.Metro/MahApps.Metro/MahApps.Metro.NET40.csproj b/src/MahApps.Metro/MahApps.Metro/MahApps.Metro.NET40.csproj
index 839c710fec..54553e7f13 100644
--- a/src/MahApps.Metro/MahApps.Metro/MahApps.Metro.NET40.csproj
+++ b/src/MahApps.Metro/MahApps.Metro/MahApps.Metro.NET40.csproj
@@ -396,6 +396,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Themes\ComboDataGrid.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Themes\ContentControlEx.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/src/MahApps.Metro/MahApps.Metro/MahApps.Metro.NET45.csproj b/src/MahApps.Metro/MahApps.Metro/MahApps.Metro.NET45.csproj
index 8c8f741f87..032119a943 100644
--- a/src/MahApps.Metro/MahApps.Metro/MahApps.Metro.NET45.csproj
+++ b/src/MahApps.Metro/MahApps.Metro/MahApps.Metro.NET45.csproj
@@ -396,6 +396,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Themes\ComboDataGrid.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\ContentControlEx.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/src/MahApps.Metro/MahApps.Metro/Properties/AssemblyInfo.cs b/src/MahApps.Metro/MahApps.Metro/Properties/AssemblyInfo.cs
index a03bc8c3b6..b192d9afd0 100644
--- a/src/MahApps.Metro/MahApps.Metro/Properties/AssemblyInfo.cs
+++ b/src/MahApps.Metro/MahApps.Metro/Properties/AssemblyInfo.cs
@@ -15,7 +15,7 @@
 [assembly: AssemblyDescription("A toolkit for creating Metro / Modern UI styled WPF apps.")]
 [assembly: AssemblyCompany("MahApps")]
 
-[assembly: AssemblyVersion("1.4.0.42")]
-[assembly: AssemblyFileVersion("1.4.0.42")]
-[assembly: AssemblyInformationalVersion("1.4.0.42")]
+[assembly: AssemblyVersion("1.4.2017.65")]
+[assembly: AssemblyFileVersion("1.4.2017.65")]
+[assembly: AssemblyInformationalVersion("1.4.2017.64")]
 [assembly: AssemblyProduct("MahApps.Metro 1.4.0")]
diff --git a/src/MahApps.Metro/MahApps.Metro/Styles/Controls.ComboBox.xaml b/src/MahApps.Metro/MahApps.Metro/Styles/Controls.ComboBox.xaml
index b7fafdcf06..3492601d9d 100644
--- a/src/MahApps.Metro/MahApps.Metro/Styles/Controls.ComboBox.xaml
+++ b/src/MahApps.Metro/MahApps.Metro/Styles/Controls.ComboBox.xaml
@@ -12,7 +12,8 @@
     <Style x:Key="EditableTextBoxStyle"
            BasedOn="{StaticResource MetroTextBox}"
            TargetType="{x:Type TextBox}">
-        <Setter Property="MinHeight" Value="26" />
+        <Setter Property="MinHeight"
+                Value="26" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
@@ -48,14 +49,18 @@
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <Grid x:Name="PART_InnerGrid" Margin="{TemplateBinding Padding}">
+                        <Grid x:Name="PART_InnerGrid"
+                              Margin="{TemplateBinding Padding}">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition x:Name="TextColumn" Width="*" />
-                                <ColumnDefinition x:Name="ButtonColumn" Width="Auto" />
+                                <ColumnDefinition x:Name="TextColumn"
+                                                  Width="*" />
+                                <ColumnDefinition x:Name="ButtonColumn"
+                                                  Width="Auto" />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
-                                <RowDefinition x:Name="ButtonRow" Height="*" />
+                                <RowDefinition x:Name="ButtonRow"
+                                               Height="*" />
                             </Grid.RowDefinitions>
 
                             <ScrollViewer x:Name="PART_ContentHost"
@@ -107,14 +112,19 @@
                         </Grid>
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Text}" Value="">
-                            <Setter TargetName="PART_Message" Property="Visibility" Value="Visible" />
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Text}"
+                                     Value="">
+                            <Setter TargetName="PART_Message"
+                                    Property="Visibility"
+                                    Value="Visible" />
                         </DataTrigger>
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}"
+                                           Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}"
+                                           Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
@@ -124,34 +134,66 @@
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ClearTextButton)}" Value="False">
-                            <Setter TargetName="PART_ContentHost" Property="Grid.ColumnSpan" Value="2" />
-                            <Setter TargetName="PART_Message" Property="Grid.ColumnSpan" Value="2" />
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ClearTextButton)}"
+                                     Value="False">
+                            <Setter TargetName="PART_ContentHost"
+                                    Property="Grid.ColumnSpan"
+                                    Value="2" />
+                            <Setter TargetName="PART_Message"
+                                    Property="Grid.ColumnSpan"
+                                    Value="2" />
                         </DataTrigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
+                        <Trigger Property="IsMouseOver"
+                                 Value="True">
+                            <Setter TargetName="Base"
+                                    Property="BorderBrush"
+                                    Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
                         </Trigger>
-                        <Trigger Property="IsReadOnly" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="IsEnabled" Value="False" />
+                        <Trigger Property="IsReadOnly"
+                                 Value="True">
+                            <Setter TargetName="PART_ClearText"
+                                    Property="IsEnabled"
+                                    Value="False" />
                         </Trigger>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
+                        <Trigger Property="IsFocused"
+                                 Value="True">
+                            <Setter TargetName="Base"
+                                    Property="BorderBrush"
+                                    Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="PART_FloatingMessage"
+                                    Property="Foreground"
+                                    Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_FloatingMessage"
+                                    Property="Opacity"
+                                    Value="1" />
                         </Trigger>
-                        <Trigger SourceName="PART_ClearText" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource GrayBrush8}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                        <Trigger SourceName="PART_ClearText"
+                                 Property="IsMouseOver"
+                                 Value="True">
+                            <Setter TargetName="PART_ClearText"
+                                    Property="Background"
+                                    Value="{DynamicResource GrayBrush8}" />
+                            <Setter TargetName="PART_ClearText"
+                                    Property="Foreground"
+                                    Value="{DynamicResource AccentColorBrush}" />
                         </Trigger>
-                        <Trigger SourceName="PART_ClearText" Property="IsPressed" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource BlackBrush}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource WhiteBrush}" />
+                        <Trigger SourceName="PART_ClearText"
+                                 Property="IsPressed"
+                                 Value="True">
+                            <Setter TargetName="PART_ClearText"
+                                    Property="Background"
+                                    Value="{DynamicResource BlackBrush}" />
+                            <Setter TargetName="PART_ClearText"
+                                    Property="Foreground"
+                                    Value="{DynamicResource WhiteBrush}" />
                         </Trigger>
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="Controls:TextBoxHelper.HasText" Value="False" />
-                                <Condition Property="IsFocused" Value="True" />
+                                <Condition Property="Controls:TextBoxHelper.HasText"
+                                           Value="False" />
+                                <Condition Property="IsFocused"
+                                           Value="True" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource enterGotFocus}" />
@@ -161,7 +203,8 @@
                             </MultiTrigger.ExitActions>
                         </MultiTrigger>
 
-                        <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
+                        <Trigger Property="Controls:TextBoxHelper.HasText"
+                                 Value="True">
                             <Trigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource enterHasText}" />
                             </Trigger.EnterActions>
@@ -176,11 +219,16 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MetroComboBoxDropDownToggleButtonStyle" TargetType="{x:Type ToggleButton}">
-        <Setter Property="Padding" Value="3" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="ClickMode" Value="Press" />
+    <Style x:Key="MetroComboBoxDropDownToggleButtonStyle"
+           TargetType="{x:Type ToggleButton}">
+        <Setter Property="Padding"
+                Value="3" />
+        <Setter Property="IsTabStop"
+                Value="False" />
+        <Setter Property="Focusable"
+                Value="False" />
+        <Setter Property="ClickMode"
+                Value="Press" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
@@ -194,9 +242,12 @@
 
                         <Grid Margin="1">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition x:Name="TextColumn" Width="*" />
-                                <ColumnDefinition x:Name="ButtonColumn" Width="Auto" />
-                                <ColumnDefinition x:Name="ToggleButtonColumn" Width="Auto" />
+                                <ColumnDefinition x:Name="TextColumn"
+                                                  Width="*" />
+                                <ColumnDefinition x:Name="ButtonColumn"
+                                                  Width="Auto" />
+                                <ColumnDefinition x:Name="ToggleButtonColumn"
+                                                  Width="Auto" />
                             </Grid.ColumnDefinitions>
 
                             <Button x:Name="PART_ClearText"
@@ -228,21 +279,44 @@
                         </Grid>
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger SourceName="BtnArrowBackground" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="BtnArrowBackground" Property="Background" Value="{DynamicResource GrayBrush5}" />
+                        <Trigger SourceName="BtnArrowBackground"
+                                 Property="IsMouseOver"
+                                 Value="True">
+                            <Setter TargetName="BtnArrowBackground"
+                                    Property="Background"
+                                    Value="{DynamicResource GrayBrush5}" />
                         </Trigger>
-                        <Trigger SourceName="PART_ClearText" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource GrayBrush8}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                        <Trigger SourceName="PART_ClearText"
+                                 Property="IsMouseOver"
+                                 Value="True">
+                            <Setter TargetName="PART_ClearText"
+                                    Property="Background"
+                                    Value="{DynamicResource GrayBrush8}" />
+                            <Setter TargetName="PART_ClearText"
+                                    Property="Foreground"
+                                    Value="{DynamicResource AccentColorBrush}" />
                         </Trigger>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsPressed}" Value="True">
-                            <Setter TargetName="BtnArrowBackground" Property="Background" Value="{DynamicResource GrayBrush3}" />
-                            <Setter TargetName="PART_Background" Property="Background" Value="{DynamicResource GrayBrush7}" />
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsPressed}"
+                                     Value="True">
+                            <Setter TargetName="BtnArrowBackground"
+                                    Property="Background"
+                                    Value="{DynamicResource GrayBrush3}" />
+                            <Setter TargetName="PART_Background"
+                                    Property="Background"
+                                    Value="{DynamicResource GrayBrush7}" />
                         </DataTrigger>
-                        <Trigger SourceName="PART_ClearText" Property="IsPressed" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource BlackBrush}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource WhiteBrush}" />
-                            <Setter TargetName="PART_Background" Property="Background" Value="{DynamicResource GrayBrush7}" />
+                        <Trigger SourceName="PART_ClearText"
+                                 Property="IsPressed"
+                                 Value="True">
+                            <Setter TargetName="PART_ClearText"
+                                    Property="Background"
+                                    Value="{DynamicResource BlackBrush}" />
+                            <Setter TargetName="PART_ClearText"
+                                    Property="Foreground"
+                                    Value="{DynamicResource WhiteBrush}" />
+                            <Setter TargetName="PART_Background"
+                                    Property="Background"
+                                    Value="{DynamicResource GrayBrush7}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -250,28 +324,49 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MetroComboBox" TargetType="{x:Type ComboBox}">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="24" />
-        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource ComboBoxMouseOverInnerBorderBrush}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource TextBoxMouseOverBorderBrush}" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="ItemContainerStyle" Value="{DynamicResource MetroComboBoxItem}" />
-        <Setter Property="MinHeight" Value="26" />
-        <Setter Property="Padding" Value="2" />
-        <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Style x:Key="MetroComboBox"
+           TargetType="{x:Type ComboBox}">
+        <Setter Property="Foreground"
+                Value="{DynamicResource TextBrush}" />
+        <Setter Property="Background"
+                Value="{DynamicResource ControlBackgroundBrush}" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource TextBoxBorderBrush}" />
+        <Setter Property="BorderThickness"
+                Value="1" />
+        <Setter Property="Controls:TextBoxHelper.ButtonWidth"
+                Value="24" />
+        <Setter Property="Controls:TextBoxHelper.ButtonFontSize"
+                Value="{DynamicResource ClearTextButtonFontSize}" />
+        <Setter Property="Controls:ControlsHelper.FocusBorderBrush"
+                Value="{DynamicResource ComboBoxMouseOverInnerBorderBrush}" />
+        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush"
+                Value="{DynamicResource TextBoxMouseOverBorderBrush}" />
+        <Setter Property="FontFamily"
+                Value="{DynamicResource ContentFontFamily}" />
+        <Setter Property="FontSize"
+                Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="HorizontalContentAlignment"
+                Value="Left" />
+        <Setter Property="VerticalContentAlignment"
+                Value="Center" />
+        <Setter Property="ItemContainerStyle"
+                Value="{DynamicResource MetroComboBoxItem}" />
+        <Setter Property="MinHeight"
+                Value="26" />
+        <Setter Property="Padding"
+                Value="2" />
+        <Setter Property="ScrollViewer.CanContentScroll"
+                Value="False" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility"
+                Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility"
+                Value="Auto" />
         <!--  change SnapsToDevicePixels to true to view a better border and validation error  -->
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
+        <Setter Property="SnapsToDevicePixels"
+                Value="True" />
+        <Setter Property="Validation.ErrorTemplate"
+                Value="{DynamicResource ValidationErrorTemplate}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ComboBox}">
@@ -304,13 +399,17 @@
                     <Grid>
                         <Grid>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition x:Name="TextColumn" Width="*" />
-                                <ColumnDefinition x:Name="ButtonColumn" Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ButtonWidth), Mode=OneWay}" />
-                                <ColumnDefinition x:Name="ToggleButtonColumn" Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ButtonWidth), Mode=OneWay}" />
+                                <ColumnDefinition x:Name="TextColumn"
+                                                  Width="*" />
+                                <ColumnDefinition x:Name="ButtonColumn"
+                                                  Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ButtonWidth), Mode=OneWay}" />
+                                <ColumnDefinition x:Name="ToggleButtonColumn"
+                                                  Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ButtonWidth), Mode=OneWay}" />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
-                                <RowDefinition x:Name="ButtonRow" Height="*" />
+                                <RowDefinition x:Name="ButtonRow"
+                                               Height="*" />
                             </Grid.RowDefinitions>
 
                             <ToggleButton x:Name="PART_DropDownToggle"
@@ -430,7 +529,8 @@
                                IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
                                Placement="Bottom"
                                PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
-                            <Grid MinWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}}" MaxHeight="{Binding MaxDropDownHeight, RelativeSource={RelativeSource TemplatedParent}}">
+                            <Grid MinWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}}"
+                                  MaxHeight="{Binding MaxDropDownHeight, RelativeSource={RelativeSource TemplatedParent}}">
                                 <Border x:Name="PopupBorder"
                                         Height="Auto"
                                         HorizontalAlignment="Stretch"
@@ -445,7 +545,8 @@
                                               BorderThickness="0">
                                     <Grid Background="{DynamicResource WhiteBrush}"
                                           RenderOptions.ClearTypeHint="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ComboBox}}, Path=(RenderOptions.ClearTypeHint), Mode=OneWay}">
-                                        <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" />
+                                        <ItemsPresenter x:Name="ItemsPresenter"
+                                                        KeyboardNavigation.DirectionalNavigation="Contained" />
                                     </Grid>
                                 </ScrollViewer>
                             </Grid>
@@ -473,24 +574,35 @@
                     <ControlTemplate.Triggers>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}" Value="True" />
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=ContextMenu, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}"
+                                           Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=ContextMenu, Converter={x:Static converters:IsNullConverter.Instance}}"
+                                           Value="False" />
                             </MultiDataTrigger.Conditions>
-                            <Setter TargetName="PART_EditableTextBox" Property="ContextMenu" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ContextMenu}" />
+                            <Setter TargetName="PART_EditableTextBox"
+                                    Property="ContextMenu"
+                                    Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ContextMenu}" />
                         </MultiDataTrigger>
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}" Value="False" />
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem}" Value="{x:Null}" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}"
+                                           Value="False" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem}"
+                                           Value="{x:Null}" />
                             </MultiDataTrigger.Conditions>
-                            <Setter TargetName="PART_WatermarkMessage" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_WatermarkMessage"
+                                    Property="Visibility"
+                                    Value="Visible" />
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Mode=OneWay, Converter={x:Static converters:IsNullConverter.Instance}}" Value="True" />
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsKeyboardFocusWithin}" Value="True" />
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}" Value="False" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Mode=OneWay, Converter={x:Static converters:IsNullConverter.Instance}}"
+                                           Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsKeyboardFocusWithin}"
+                                           Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}"
+                                           Value="False" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource enterGotFocus}" />
@@ -501,8 +613,10 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Mode=OneWay, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}" Value="False" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Mode=OneWay, Converter={x:Static converters:IsNullConverter.Instance}}"
+                                           Value="False" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}"
+                                           Value="False" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource enterHasText}" />
@@ -513,9 +627,12 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}" Value="False" />
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Mode=OneWay, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}"
+                                           Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}"
+                                           Value="False" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Mode=OneWay, Converter={x:Static converters:IsNullConverter.Instance}}"
+                                           Value="False" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
@@ -525,47 +642,93 @@
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ClearTextButton)}" Value="False">
-                            <Setter TargetName="ContentSite" Property="Grid.ColumnSpan" Value="2" />
-                            <Setter TargetName="PART_EditableTextBox" Property="Grid.ColumnSpan" Value="2" />
-                            <Setter TargetName="PART_WatermarkMessage" Property="Grid.ColumnSpan" Value="2" />
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ClearTextButton)}"
+                                     Value="False">
+                            <Setter TargetName="ContentSite"
+                                    Property="Grid.ColumnSpan"
+                                    Value="2" />
+                            <Setter TargetName="PART_EditableTextBox"
+                                    Property="Grid.ColumnSpan"
+                                    Value="2" />
+                            <Setter TargetName="PART_WatermarkMessage"
+                                    Property="Grid.ColumnSpan"
+                                    Value="2" />
                         </DataTrigger>
-                        <Trigger Property="IsEditable" Value="True">
-                            <Setter Property="IsTabStop" Value="false" />
-                            <Setter TargetName="ContentSite" Property="Visibility" Value="Hidden" />
-                            <Setter TargetName="PART_DropDownToggle" Property="Focusable" Value="False" />
-                            <Setter TargetName="PART_EditableTextBox" Property="Visibility" Value="Visible" />
+                        <Trigger Property="IsEditable"
+                                 Value="True">
+                            <Setter Property="IsTabStop"
+                                    Value="false" />
+                            <Setter TargetName="ContentSite"
+                                    Property="Visibility"
+                                    Value="Hidden" />
+                            <Setter TargetName="PART_DropDownToggle"
+                                    Property="Focusable"
+                                    Value="False" />
+                            <Setter TargetName="PART_EditableTextBox"
+                                    Property="Visibility"
+                                    Value="Visible" />
                         </Trigger>
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsEditable" Value="False" />
-                                <Condition Property="IsMouseOver" Value="True" />
+                                <Condition Property="IsEditable"
+                                           Value="False" />
+                                <Condition Property="IsMouseOver"
+                                           Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{DynamicResource GrayBrush9}" />
+                            <Setter Property="Background"
+                                    Value="{DynamicResource GrayBrush9}" />
                         </MultiTrigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="FocusBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
-                            <Setter TargetName="FocusBorder" Property="Visibility" Value="Visible" />
+                        <Trigger Property="IsMouseOver"
+                                 Value="True">
+                            <Setter TargetName="FocusBorder"
+                                    Property="BorderBrush"
+                                    Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
+                            <Setter TargetName="FocusBorder"
+                                    Property="Visibility"
+                                    Value="Visible" />
                         </Trigger>
 
-                        <Trigger SourceName="PART_EditableTextBox" Property="IsFocused" Value="True">
-                            <Setter TargetName="FocusBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="FocusBorder" Property="Visibility" Value="Visible" />
+                        <Trigger SourceName="PART_EditableTextBox"
+                                 Property="IsFocused"
+                                 Value="True">
+                            <Setter TargetName="FocusBorder"
+                                    Property="BorderBrush"
+                                    Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="FocusBorder"
+                                    Property="Visibility"
+                                    Value="Visible" />
                         </Trigger>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="FocusBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="FocusBorder" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
+                        <Trigger Property="IsFocused"
+                                 Value="True">
+                            <Setter TargetName="FocusBorder"
+                                    Property="BorderBrush"
+                                    Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="FocusBorder"
+                                    Property="Visibility"
+                                    Value="Visible" />
+                            <Setter TargetName="PART_FloatingMessage"
+                                    Property="Foreground"
+                                    Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_FloatingMessage"
+                                    Property="Opacity"
+                                    Value="1" />
                         </Trigger>
-                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                            <Setter TargetName="FocusBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="FocusBorder" Property="Visibility" Value="Visible" />
+                        <Trigger Property="IsKeyboardFocusWithin"
+                                 Value="True">
+                            <Setter TargetName="FocusBorder"
+                                    Property="BorderBrush"
+                                    Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="FocusBorder"
+                                    Property="Visibility"
+                                    Value="Visible" />
                         </Trigger>
 
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="DisabledVisualElement" Property="Visibility" Value="Visible" />
+                        <Trigger Property="IsEnabled"
+                                 Value="False">
+                            <Setter TargetName="DisabledVisualElement"
+                                    Property="Visibility"
+                                    Value="Visible" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -586,26 +749,38 @@
                 </ItemsPanelTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
+        <Setter Property="ScrollViewer.CanContentScroll"
+                Value="True" />
         <Style.Triggers>
-            <Trigger Property="IsGrouping" Value="True">
-                <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
+            <Trigger Property="IsGrouping"
+                     Value="True">
+                <Setter Property="ScrollViewer.CanContentScroll"
+                        Value="False" />
             </Trigger>
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MetroComboBoxItem" TargetType="ComboBoxItem">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-        <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="Padding" Value="2" />
-        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
+    <Style x:Key="MetroComboBoxItem"
+           TargetType="ComboBoxItem">
+        <Setter Property="Foreground"
+                Value="{DynamicResource TextBrush}" />
+        <Setter Property="Background"
+                Value="{DynamicResource WhiteBrush}" />
+        <Setter Property="BorderThickness"
+                Value="0" />
+        <Setter Property="HorizontalContentAlignment"
+                Value="Left" />
+        <Setter Property="VerticalContentAlignment"
+                Value="Top" />
+        <Setter Property="Padding"
+                Value="2" />
+        <Setter Property="RenderOptions.ClearTypeHint"
+                Value="Enabled" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ComboBoxItem">
-                    <Grid Margin="0 0.5" Background="{TemplateBinding Background}">
+                    <Grid Margin="0 0.5"
+                          Background="{TemplateBinding Background}">
                         <Border x:Name="ItemBackground"
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
@@ -623,8 +798,10 @@
                                 <VisualState x:Name="MouseOver" />
                                 <VisualState x:Name="Disabled">
                                     <Storyboard>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity">
-                                            <SplineDoubleKeyFrame KeyTime="0" Value=".55" />
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="contentPresenter"
+                                                                       Storyboard.TargetProperty="Opacity">
+                                            <SplineDoubleKeyFrame KeyTime="0"
+                                                                  Value=".55" />
                                         </DoubleAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
@@ -632,12 +809,19 @@
                         </VisualStateManager.VisualStateGroups>
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter Property="Foreground" Value="{DynamicResource AccentSelectedColorBrush}" />
-                            <Setter TargetName="ItemBackground" Property="Background" Value="{DynamicResource AccentColorBrush}" />
+                        <Trigger Property="IsSelected"
+                                 Value="True">
+                            <Setter Property="Foreground"
+                                    Value="{DynamicResource AccentSelectedColorBrush}" />
+                            <Setter TargetName="ItemBackground"
+                                    Property="Background"
+                                    Value="{DynamicResource AccentColorBrush}" />
                         </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="ItemBackground" Property="Background" Value="{DynamicResource AccentColorBrush2}" />
+                        <Trigger Property="IsMouseOver"
+                                 Value="True">
+                            <Setter TargetName="ItemBackground"
+                                    Property="Background"
+                                    Value="{DynamicResource AccentColorBrush2}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/MahApps.Metro/MahApps.Metro/Themes/ComboDataGrid.xaml b/src/MahApps.Metro/MahApps.Metro/Themes/ComboDataGrid.xaml
new file mode 100644
index 0000000000..34a7194195
--- /dev/null
+++ b/src/MahApps.Metro/MahApps.Metro/Themes/ComboDataGrid.xaml
@@ -0,0 +1,688 @@
+<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:converters="clr-namespace:MahApps.Metro.Converters">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TextBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Shared.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style x:Key="EditableTextBoxStyle2"
+           BasedOn="{StaticResource MetroTextBox}"
+           TargetType="{x:Type TextBox}">
+        <Setter Property="MinHeight"
+                Value="26" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TextBox}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="enterGotFocus">
+                            <DoubleAnimation Duration="0:0:0.2"
+                                             Storyboard.TargetName="PART_Message"
+                                             Storyboard.TargetProperty="Opacity"
+                                             To=".2" />
+                        </Storyboard>
+                        <Storyboard x:Key="exitGotFocus">
+                            <DoubleAnimation Duration="0:0:0.2"
+                                             Storyboard.TargetName="PART_Message"
+                                             Storyboard.TargetProperty="Opacity" />
+                        </Storyboard>
+
+                        <Storyboard x:Key="enterHasText">
+                            <DoubleAnimation Duration="0:0:0.2"
+                                             From=".2"
+                                             Storyboard.TargetName="PART_Message"
+                                             Storyboard.TargetProperty="Opacity"
+                                             To="0" />
+                        </Storyboard>
+                        <Storyboard x:Key="exitHasText">
+                            <DoubleAnimation Duration="0:0:0.2"
+                                             Storyboard.TargetName="PART_Message"
+                                             Storyboard.TargetProperty="Opacity" />
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <Grid>
+                        <Border x:Name="Base"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <Grid x:Name="PART_InnerGrid"
+                              Margin="{TemplateBinding Padding}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition x:Name="TextColumn"
+                                                  Width="*" />
+                                <ColumnDefinition x:Name="ButtonColumn"
+                                                  Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition x:Name="ButtonRow"
+                                               Height="*" />
+                            </Grid.RowDefinitions>
+
+                            <ScrollViewer x:Name="PART_ContentHost"
+                                          Grid.Row="1"
+                                          Grid.Column="0"
+                                          Margin="0"
+                                          VerticalAlignment="Stretch"
+                                          Background="{x:Null}"
+                                          BorderThickness="0"
+                                          IsTabStop="False" />
+                            <TextBlock x:Name="PART_Message"
+                                       Grid.Row="1"
+                                       Grid.Column="0"
+                                       Margin="4 0 4 0"
+                                       Padding="{TemplateBinding Padding}"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       Foreground="{TemplateBinding Foreground}"
+                                       Opacity="0.6"
+                                       IsHitTestVisible="False"
+                                       Text="{TemplateBinding controls:TextBoxHelper.Watermark}"
+                                       Visibility="Collapsed" />
+                            <ContentControl x:Name="PART_FloatingMessageContainer"
+                                            Grid.Row="0"
+                                            Grid.Column="0"
+                                            Grid.ColumnSpan="2"
+                                            Style="{DynamicResource FloatingMessageContainerStyle}">
+                                <TextBlock x:Name="PART_FloatingMessage"
+                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                           Foreground="{TemplateBinding Foreground}"
+                                           Text="{TemplateBinding controls:TextBoxHelper.Watermark}" />
+                            </ContentControl>
+                            <Button x:Name="PART_ClearText"
+                                    Grid.Row="0"
+                                    Grid.RowSpan="2"
+                                    Grid.Column="1"
+                                    Width="{TemplateBinding controls:TextBoxHelper.ButtonWidth}"
+                                    Style="{DynamicResource ChromelessButtonStyle}"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    FontFamily="{TemplateBinding controls:TextBoxHelper.ButtonFontFamily}"
+                                    FontSize="{TemplateBinding controls:TextBoxHelper.ButtonFontSize}"
+                                    controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:TextBoxHelper.ClearTextButton), Mode=OneWay}"
+                                    Content="{TemplateBinding controls:TextBoxHelper.ButtonContent}"
+                                    ContentTemplate="{TemplateBinding controls:TextBoxHelper.ButtonContentTemplate}"
+                                    IsTabStop="False"
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                        </Grid>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Text}"
+                                     Value="">
+                            <Setter TargetName="PART_Message"
+                                    Property="Visibility"
+                                    Value="Visible" />
+                        </DataTrigger>
+
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=(controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}"
+                                           Value="True" />
+                                <Condition Binding="{Binding Path=(controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}"
+                                           Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.EnterActions>
+                            <MultiDataTrigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.ExitActions>
+                        </MultiDataTrigger>
+
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(controls:TextBoxHelper.ClearTextButton)}"
+                                     Value="False">
+                            <Setter TargetName="PART_ContentHost"
+                                    Property="Grid.ColumnSpan"
+                                    Value="2" />
+                            <Setter TargetName="PART_Message"
+                                    Property="Grid.ColumnSpan"
+                                    Value="2" />
+                        </DataTrigger>
+                        <Trigger Property="IsMouseOver"
+                                 Value="True">
+                            <Setter TargetName="Base"
+                                    Property="BorderBrush"
+                                    Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.MouseOverBorderBrush)}" />
+                        </Trigger>
+                        <Trigger Property="IsReadOnly"
+                                 Value="True">
+                            <Setter TargetName="PART_ClearText"
+                                    Property="IsEnabled"
+                                    Value="False" />
+                        </Trigger>
+                        <Trigger Property="IsFocused"
+                                 Value="True">
+                            <Setter TargetName="Base"
+                                    Property="BorderBrush"
+                                    Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="PART_FloatingMessage"
+                                    Property="Foreground"
+                                    Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_FloatingMessage"
+                                    Property="Opacity"
+                                    Value="1" />
+                        </Trigger>
+                        <Trigger SourceName="PART_ClearText"
+                                 Property="IsMouseOver"
+                                 Value="True">
+                            <Setter TargetName="PART_ClearText"
+                                    Property="Background"
+                                    Value="{DynamicResource GrayBrush8}" />
+                            <Setter TargetName="PART_ClearText"
+                                    Property="Foreground"
+                                    Value="{DynamicResource AccentColorBrush}" />
+                        </Trigger>
+                        <Trigger SourceName="PART_ClearText"
+                                 Property="IsPressed"
+                                 Value="True">
+                            <Setter TargetName="PART_ClearText"
+                                    Property="Background"
+                                    Value="{DynamicResource BlackBrush}" />
+                            <Setter TargetName="PART_ClearText"
+                                    Property="Foreground"
+                                    Value="{DynamicResource WhiteBrush}" />
+                        </Trigger>
+
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="controls:TextBoxHelper.HasText"
+                                           Value="False" />
+                                <Condition Property="IsFocused"
+                                           Value="True" />
+                            </MultiTrigger.Conditions>
+                            <MultiTrigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource enterGotFocus}" />
+                            </MultiTrigger.EnterActions>
+                            <MultiTrigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource exitGotFocus}" />
+                            </MultiTrigger.ExitActions>
+                        </MultiTrigger>
+
+                        <Trigger Property="controls:TextBoxHelper.HasText"
+                                 Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource enterHasText}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource exitHasText}" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    
+    <Style TargetType="{x:Type controls:ComboDataGrid}">
+        <Setter Property="Foreground"
+                Value="{DynamicResource TextBrush}" />
+        <Setter Property="Background"
+                Value="{DynamicResource ControlBackgroundBrush}" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource TextBoxBorderBrush}" />
+        <Setter Property="BorderThickness"
+                Value="1" />
+        <Setter Property="controls:ControlsHelper.ButtonWidth"
+                Value="24" />
+        <Setter Property="controls:TextBoxHelper.ButtonFontSize"
+                Value="{DynamicResource ClearTextButtonFontSize}" />
+        <Setter Property="controls:ControlsHelper.FocusBorderBrush"
+                Value="{DynamicResource ComboBoxMouseOverInnerBorderBrush}" />
+        <Setter Property="controls:ControlsHelper.MouseOverBorderBrush"
+                Value="{DynamicResource TextBoxMouseOverBorderBrush}" />
+        <Setter Property="FontFamily"
+                Value="{DynamicResource ContentFontFamily}" />
+        <Setter Property="FontSize"
+                Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="HorizontalContentAlignment"
+                Value="Left" />
+        <Setter Property="VerticalContentAlignment"
+                Value="Center" />
+        <Setter Property="ItemContainerStyle"
+                Value="{DynamicResource MetroComboBoxItem}" />
+        <Setter Property="MinHeight"
+                Value="26" />
+        <Setter Property="Padding"
+                Value="2" />
+        <Setter Property="ScrollViewer.CanContentScroll"
+                Value="False" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility"
+                Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility"
+                Value="Auto" />
+        <!--  change SnapsToDevicePixels to true to view a better border and validation error  -->
+        <Setter Property="SnapsToDevicePixels"
+                Value="True" />
+        <Setter Property="Validation.ErrorTemplate"
+                Value="{DynamicResource ValidationErrorTemplate}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:ComboDataGrid}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="enterGotFocus">
+                            <DoubleAnimation Duration="0:0:0.2"
+                                             Storyboard.TargetName="PART_WatermarkMessage"
+                                             Storyboard.TargetProperty="Opacity"
+                                             To=".2" />
+                        </Storyboard>
+                        <Storyboard x:Key="exitGotFocus">
+                            <DoubleAnimation Duration="0:0:0.2"
+                                             Storyboard.TargetName="PART_WatermarkMessage"
+                                             Storyboard.TargetProperty="Opacity" />
+                        </Storyboard>
+
+                        <Storyboard x:Key="enterHasText">
+                            <DoubleAnimation Duration="0:0:0.2"
+                                             From=".2"
+                                             Storyboard.TargetName="PART_WatermarkMessage"
+                                             Storyboard.TargetProperty="Opacity"
+                                             To="0" />
+                        </Storyboard>
+                        <Storyboard x:Key="exitHasText">
+                            <DoubleAnimation Duration="0:0:0.2"
+                                             Storyboard.TargetName="PART_WatermarkMessage"
+                                             Storyboard.TargetProperty="Opacity" />
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <Grid>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition x:Name="TextColumn"
+                                                  Width="*" />
+                                <ColumnDefinition x:Name="ButtonColumn"
+                                                  Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.ButtonWidth), Mode=OneWay}" />
+                                <ColumnDefinition x:Name="ToggleButtonColumn"
+                                                  Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.ButtonWidth), Mode=OneWay}" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition x:Name="ButtonRow"
+                                               Height="*" />
+                            </Grid.RowDefinitions>
+                            <!--<ToggleButton x:Name="PART_DropDownToggle"
+                                          Grid.ColumnSpan="3"
+                                          Margin="0"
+                                          VerticalAlignment="Stretch"
+                                          Style="{DynamicResource MetroComboBoxDropDownToggleButtonStyle}"
+                                          Background="{TemplateBinding Background}"
+                                          Foreground="{TemplateBinding Foreground}"
+                                          BorderBrush="{TemplateBinding BorderBrush}"
+                                          BorderThickness="{TemplateBinding BorderThickness}"
+                                          controls:ControlsHelper.ButtonWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.ButtonWidth), Mode=OneWay}"
+                                          controls:ControlsHelper.CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.CornerRadius), Mode=OneWay}"
+                                          controls:TextBoxHelper.ButtonContent="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:TextBoxHelper.ButtonContent), Mode=OneWay}"
+                                          controls:TextBoxHelper.ButtonContentTemplate="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:TextBoxHelper.ButtonContentTemplate), Mode=OneWay}"
+                                          controls:TextBoxHelper.ButtonFontFamily="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:TextBoxHelper.ButtonFontFamily), Mode=OneWay}"
+                                          controls:TextBoxHelper.ClearTextButton="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:TextBoxHelper.ClearTextButton), Mode=OneWay}"
+                                          IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                          KeyboardNavigation.IsTabStop="False"
+                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                            <TextBox x:Name="PART_EditableTextBox"
+                                     Grid.Column="0"
+                                     Margin="1 1 0 -1"
+                                     HorizontalAlignment="Stretch"
+                                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                     Style="{DynamicResource EditableTextBoxStyle}"
+                                     Background="{x:Null}"
+                                     Foreground="{TemplateBinding Foreground}"
+                                     BorderThickness="0"
+                                     FontFamily="{TemplateBinding FontFamily}"
+                                     FontSize="{TemplateBinding FontSize}"
+                                     controls:TextBoxHelper.ButtonContent="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:TextBoxHelper.ButtonContent), Mode=OneWay}"
+                                     controls:TextBoxHelper.ButtonContentTemplate="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:TextBoxHelper.ButtonContentTemplate), Mode=OneWay}"
+                                     controls:TextBoxHelper.HasText="{TemplateBinding controls:TextBoxHelper.HasText}"
+                                     controls:TextBoxHelper.UseFloatingWatermark="{TemplateBinding controls:TextBoxHelper.UseFloatingWatermark}"
+                                     controls:TextBoxHelper.Watermark="{TemplateBinding controls:TextBoxHelper.Watermark}"
+                                     CharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ComboBoxHelper.CharacterCasing), Mode=OneWay}"
+                                     Focusable="True"
+                                     IsReadOnly="{TemplateBinding IsReadOnly}"
+                                     MaxLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ComboBoxHelper.MaxLength), Mode=OneWay}"
+                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                     Visibility="Collapsed" />
+
+
+                            <TextBlock x:Name="PART_WatermarkMessage"
+                                       Grid.Column="0"
+                                       Margin="6 2 6 2"
+                                       Padding="{TemplateBinding Padding}"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       Foreground="{TemplateBinding Foreground}"
+                                       Opacity="0.6"
+                                       FontFamily="{TemplateBinding FontFamily}"
+                                       FontSize="{TemplateBinding FontSize}"
+                                       IsHitTestVisible="False"
+                                       Text="{TemplateBinding controls:TextBoxHelper.Watermark}"
+                                       Visibility="Collapsed" />-->
+
+                            <ToggleButton x:Name="PART_DropDownToggle"
+                                          Grid.RowSpan="2"
+                                          Grid.ColumnSpan="3"
+                                          Margin="0"
+                                          VerticalAlignment="Stretch"
+                                          Style="{DynamicResource MetroComboBoxDropDownToggleButtonStyle}"
+                                          Background="{TemplateBinding Background}"
+                                          Foreground="{TemplateBinding Foreground}"
+                                          BorderBrush="{TemplateBinding BorderBrush}"
+                                          BorderThickness="{TemplateBinding BorderThickness}"
+                                          controls:TextBoxHelper.ButtonWidth="{TemplateBinding controls:TextBoxHelper.ButtonWidth}"
+                                          controls:ControlsHelper.CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.CornerRadius), Mode=OneWay}"
+                                          controls:TextBoxHelper.ButtonContent="{TemplateBinding controls:TextBoxHelper.ButtonContent}"
+                                          controls:TextBoxHelper.ButtonContentTemplate="{TemplateBinding controls:TextBoxHelper.ButtonContentTemplate}"
+                                          controls:TextBoxHelper.ButtonFontFamily="{TemplateBinding controls:TextBoxHelper.ButtonFontFamily}"
+                                          controls:TextBoxHelper.ButtonFontSize="{TemplateBinding controls:TextBoxHelper.ButtonFontSize}"
+                                          controls:TextBoxHelper.ClearTextButton="{TemplateBinding controls:TextBoxHelper.ClearTextButton}"
+                                          IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                          KeyboardNavigation.IsTabStop="False"
+                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                            <TextBox x:Name="PART_EditableTextBox"
+                                     Grid.Column="0"
+                                     Grid.Row="1"
+                                     Margin="1"
+                                     Padding="{TemplateBinding Padding}"
+                                     HorizontalAlignment="Stretch"
+                                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                     Style="{StaticResource EditableTextBoxStyle2}"
+                                     Background="{x:Null}"
+                                     Foreground="{TemplateBinding Foreground}"
+                                     BorderThickness="0"
+                                     FontFamily="{TemplateBinding FontFamily}"
+                                     FontSize="{TemplateBinding FontSize}"
+                                     controls:TextBoxHelper.ButtonWidth="{TemplateBinding controls:TextBoxHelper.ButtonWidth}"
+                                     controls:TextBoxHelper.ButtonContent="{TemplateBinding controls:TextBoxHelper.ButtonContent}"
+                                     controls:TextBoxHelper.ButtonContentTemplate="{TemplateBinding controls:TextBoxHelper.ButtonContentTemplate}"
+                                     controls:TextBoxHelper.HasText="{TemplateBinding controls:TextBoxHelper.HasText}"
+                                     controls:TextBoxHelper.ButtonFontFamily="{TemplateBinding controls:TextBoxHelper.ButtonFontFamily}"
+                                     controls:TextBoxHelper.ButtonFontSize="{TemplateBinding controls:TextBoxHelper.ButtonFontSize}"
+                                     controls:TextBoxHelper.UseFloatingWatermark="{TemplateBinding controls:TextBoxHelper.UseFloatingWatermark}"
+                                     controls:TextBoxHelper.Watermark="{TemplateBinding controls:TextBoxHelper.Watermark}"
+                                     CharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ComboBoxHelper.CharacterCasing), Mode=OneWay}"
+                                     Focusable="True"
+                                     IsReadOnly="{TemplateBinding IsReadOnly}"
+                                     MaxLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ComboBoxHelper.MaxLength), Mode=OneWay}"
+                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                     Visibility="Collapsed" />
+                            <TextBlock x:Name="PART_WatermarkMessage"
+                                       Grid.Column="0"
+                                       Grid.Row="1"
+                                       Margin="6 2"
+                                       Padding="{TemplateBinding Padding}"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       Foreground="{TemplateBinding Foreground}"
+                                       Opacity="0.6"
+                                       FontFamily="{TemplateBinding FontFamily}"
+                                       FontSize="{TemplateBinding FontSize}"
+                                       IsHitTestVisible="False"
+                                       Text="{TemplateBinding controls:TextBoxHelper.Watermark}"
+                                       Visibility="Collapsed" />
+
+                            <ContentControl x:Name="PART_FloatingMessageContainer"
+                                            Grid.Column="0"
+                                            Grid.Row="0"
+                                            Style="{DynamicResource FloatingMessageContainerStyle}">
+                                <TextBlock x:Name="PART_FloatingMessage"
+                                           Margin="2 2 0 0"
+                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                           Foreground="{TemplateBinding Foreground}"
+                                           Text="{TemplateBinding controls:TextBoxHelper.Watermark}" />
+                            </ContentControl>
+
+                            <Grid x:Name="ContentSite"
+                                  Grid.Column="0"
+                                  Grid.Row="1"
+                                  Margin="4 0 4 0">
+                                <ContentPresenter Margin="{TemplateBinding Padding}"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding SelectionBoxItem}"
+                                                  ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
+                                                  ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                                  IsHitTestVisible="False"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            </Grid>
+                        </Grid>
+
+                        <Border x:Name="FocusBorder"
+                                Grid.ColumnSpan="3"
+                                Background="{x:Null}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.CornerRadius), Mode=OneWay}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                Visibility="Collapsed" />
+                        <Border x:Name="DisabledVisualElement"
+                                Grid.ColumnSpan="3"
+                                Background="{DynamicResource ControlsDisabledBrush}"
+                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Opacity="0.6"
+                                CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.CornerRadius), Mode=OneWay}"
+                                IsHitTestVisible="False"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                Visibility="Collapsed" />
+
+                        <!--  AllowsTransparency="true" fixes the redraw problem under windows vista/7 with a selected non aero theme  -->
+                        <Popup x:Name="PART_Popup"
+                               AllowsTransparency="True"
+                               Focusable="False"
+                               IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                               Placement="Bottom"
+                               PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                            <Grid MinWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}}"
+                                  MaxHeight="{Binding MaxDropDownHeight, RelativeSource={RelativeSource TemplatedParent}}">
+                                <Border x:Name="PopupBorder"
+                                        Height="Auto"
+                                        HorizontalAlignment="Stretch"
+                                        Background="{DynamicResource WhiteBrush}"
+                                        BorderBrush="{DynamicResource ComboBoxPopupBrush}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        Effect="{DynamicResource DropShadowBrush}" />
+
+                                <Grid  Background="{DynamicResource WhiteBrush}"
+                                       Margin="2"
+                                       RenderOptions.ClearTypeHint="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ComboBox}}, Path=(RenderOptions.ClearTypeHint), Mode=OneWay}">
+                                    <DataGrid x:Name="PART_DataGrid"
+                                              KeyboardNavigation.DirectionalNavigation="Contained"
+                                              Background="{DynamicResource WhiteBrush}"
+                                              Margin="1"
+                                              BorderThickness="0"
+                                              Focusable="False"
+                                              ItemsSource="{TemplateBinding ItemsSource}"
+                                              SelectedItem="{Binding Mode=TwoWay, Path=SelectedItem, RelativeSource={RelativeSource Mode=TemplatedParent}}"
+                                              SelectionMode="Single"
+                                              AutoGenerateColumns="{TemplateBinding AutoGenerateColumns}" />
+                                </Grid>
+                            </Grid>
+                        </Popup>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused" />
+                                <VisualState x:Name="Unfocused" />
+                                <VisualState x:Name="FocusedDropDown">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Duration="00:00:00"
+                                                                       Storyboard.TargetName="PopupBorder"
+                                                                       Storyboard.TargetProperty="(UIElement.Visibility)">
+                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <Visibility>Visible</Visibility>
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}"
+                                           Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=ContextMenu, Converter={x:Static converters:IsNullConverter.Instance}}"
+                                           Value="False" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_EditableTextBox"
+                                    Property="ContextMenu"
+                                    Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ContextMenu}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}"
+                                           Value="False" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem}"
+                                           Value="{x:Null}" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_WatermarkMessage"
+                                    Property="Visibility"
+                                    Value="Visible" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Mode=OneWay, Converter={x:Static converters:IsNullConverter.Instance}}"
+                                           Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsKeyboardFocusWithin}"
+                                           Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}"
+                                           Value="False" />
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource enterGotFocus}" />
+                            </MultiDataTrigger.EnterActions>
+                            <MultiDataTrigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource exitGotFocus}" />
+                            </MultiDataTrigger.ExitActions>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Mode=OneWay, Converter={x:Static converters:IsNullConverter.Instance}}"
+                                           Value="False" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}"
+                                           Value="False" />
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource enterHasText}" />
+                            </MultiDataTrigger.EnterActions>
+                            <MultiDataTrigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource exitHasText}" />
+                            </MultiDataTrigger.ExitActions>
+                        </MultiDataTrigger>
+
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=(controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}"
+                                           Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}"
+                                           Value="False" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Mode=OneWay, Converter={x:Static converters:IsNullConverter.Instance}}"
+                                           Value="False" />
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.EnterActions>
+                            <MultiDataTrigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.ExitActions>
+                        </MultiDataTrigger>
+
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(controls:TextBoxHelper.ClearTextButton)}"
+                                     Value="False">
+                            <Setter TargetName="ContentSite"
+                                    Property="Grid.ColumnSpan"
+                                    Value="2" />
+                            <Setter TargetName="PART_EditableTextBox"
+                                    Property="Grid.ColumnSpan"
+                                    Value="2" />
+                            <Setter TargetName="PART_WatermarkMessage"
+                                    Property="Grid.ColumnSpan"
+                                    Value="2" />
+                        </DataTrigger>
+                        <Trigger Property="IsEditable"
+                                 Value="True">
+                            <Setter Property="IsTabStop"
+                                    Value="false" />
+                            <Setter TargetName="ContentSite"
+                                    Property="Visibility"
+                                    Value="Hidden" />
+                            <Setter TargetName="PART_DropDownToggle"
+                                    Property="Focusable"
+                                    Value="False" />
+                            <Setter TargetName="PART_EditableTextBox"
+                                    Property="Visibility"
+                                    Value="Visible" />
+                        </Trigger>
+
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsEditable"
+                                           Value="False" />
+                                <Condition Property="IsMouseOver"
+                                           Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Background"
+                                    Value="{DynamicResource GrayBrush9}" />
+                        </MultiTrigger>
+                        <Trigger Property="IsMouseOver"
+                                 Value="True">
+                            <Setter TargetName="FocusBorder"
+                                    Property="BorderBrush"
+                                    Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.MouseOverBorderBrush)}" />
+                            <Setter TargetName="FocusBorder"
+                                    Property="Visibility"
+                                    Value="Visible" />
+                        </Trigger>
+
+                        <Trigger SourceName="PART_EditableTextBox"
+                                 Property="IsFocused"
+                                 Value="True">
+                            <Setter TargetName="FocusBorder"
+                                    Property="BorderBrush"
+                                    Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="FocusBorder"
+                                    Property="Visibility"
+                                    Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsFocused"
+                                 Value="True">
+                            <Setter TargetName="FocusBorder"
+                                    Property="BorderBrush"
+                                    Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="FocusBorder"
+                                    Property="Visibility"
+                                    Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin"
+                                 Value="True">
+                            <Setter TargetName="FocusBorder"
+                                    Property="BorderBrush"
+                                    Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="FocusBorder"
+                                    Property="Visibility"
+                                    Value="Visible" />
+                        </Trigger>
+
+                        <Trigger Property="IsEnabled"
+                                 Value="False">
+                            <Setter TargetName="DisabledVisualElement"
+                                    Property="Visibility"
+                                    Value="Visible" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/MahApps.Metro/Themes/Generic.xaml b/src/MahApps.Metro/MahApps.Metro/Themes/Generic.xaml
index 83727ca64e..72bb907e5d 100644
--- a/src/MahApps.Metro/MahApps.Metro/Themes/Generic.xaml
+++ b/src/MahApps.Metro/MahApps.Metro/Themes/Generic.xaml
@@ -34,6 +34,7 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/HotKeyBox.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/ContentControlEx.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/Dialogs/BaseMetroDialog.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/ComboDataGrid.xaml" />
     </ResourceDictionary.MergedDictionaries>
     
     <!--  set up default styles for our custom controls  -->
diff --git a/src/Mahapps.Metro.Tests/Mahapps.Metro.Tests.NET40/Properties/AssemblyInfo.cs b/src/Mahapps.Metro.Tests/Mahapps.Metro.Tests.NET40/Properties/AssemblyInfo.cs
index 8b28f020b1..14f5fd284e 100644
--- a/src/Mahapps.Metro.Tests/Mahapps.Metro.Tests.NET40/Properties/AssemblyInfo.cs
+++ b/src/Mahapps.Metro.Tests/Mahapps.Metro.Tests.NET40/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.2017.5")]
+[assembly: AssemblyFileVersion("1.0.2017.5")]

From ce8f1bdc26555bf5708ca215002e9be8abb0f834 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 11 May 2017 21:08:13 +0200
Subject: [PATCH 02/10] Update AssemblyInfo.cs

---
 .../Properties/AssemblyInfo.cs                                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET40/Properties/AssemblyInfo.cs b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET40/Properties/AssemblyInfo.cs
index 3bd85e2e47..846bd45942 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET40/Properties/AssemblyInfo.cs
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET40/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2017.5")]
-[assembly: AssemblyFileVersion("1.0.2017.5")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

From c72ee735ec7508ba82295708f206dff4845026c6 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 11 May 2017 21:08:40 +0200
Subject: [PATCH 03/10] Update AssemblyInfo.cs

---
 .../Properties/AssemblyInfo.cs                                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET45/Properties/AssemblyInfo.cs b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET45/Properties/AssemblyInfo.cs
index 90e75c69da..98c982d8d3 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET45/Properties/AssemblyInfo.cs
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET45/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2017.10")]
-[assembly: AssemblyFileVersion("1.0.2017.10")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

From ccca83c858a1e09cca275d686195a67935a3606e Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 11 May 2017 21:09:38 +0200
Subject: [PATCH 04/10] Update AssemblyInfo.cs

---
 .../MahApps.Metro.Demo.NET40/Properties/AssemblyInfo.cs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/Properties/AssemblyInfo.cs b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/Properties/AssemblyInfo.cs
index 13b671dfd4..603603bce4 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/Properties/AssemblyInfo.cs
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2017.6")]
-[assembly: AssemblyFileVersion("1.0.2017.6")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

From fb758038830150ad69409bbc8d05f10ce19abdf6 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 11 May 2017 21:09:52 +0200
Subject: [PATCH 05/10] Update AssemblyInfo.cs

---
 .../MahApps.Metro.Demo.NET45/Properties/AssemblyInfo.cs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET45/Properties/AssemblyInfo.cs b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET45/Properties/AssemblyInfo.cs
index acb487ec8c..f5f620c8ee 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET45/Properties/AssemblyInfo.cs
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET45/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2017.20")]
-[assembly: AssemblyFileVersion("1.0.2017.20")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

From c99c2ed6a92929d1b053a3485e871f4c5c80d354 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 11 May 2017 21:11:27 +0200
Subject: [PATCH 06/10] Update AssemblyInfo.cs

---
 .../Mahapps.Metro.Tests.NET40/Properties/AssemblyInfo.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Mahapps.Metro.Tests/Mahapps.Metro.Tests.NET40/Properties/AssemblyInfo.cs b/src/Mahapps.Metro.Tests/Mahapps.Metro.Tests.NET40/Properties/AssemblyInfo.cs
index 14f5fd284e..8b28f020b1 100644
--- a/src/Mahapps.Metro.Tests/Mahapps.Metro.Tests.NET40/Properties/AssemblyInfo.cs
+++ b/src/Mahapps.Metro.Tests/Mahapps.Metro.Tests.NET40/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2017.5")]
-[assembly: AssemblyFileVersion("1.0.2017.5")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

From 59a150b3799281d02bd735c823f1a1dc58a1be82 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 11 May 2017 21:13:07 +0200
Subject: [PATCH 07/10] Update MahApps.Metro.Demo.NET40.csproj

---
 .../MahApps.Metro.Demo.NET40/MahApps.Metro.Demo.NET40.csproj  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/MahApps.Metro.Demo.NET40.csproj b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/MahApps.Metro.Demo.NET40.csproj
index a1ab89f15a..63843c7b23 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/MahApps.Metro.Demo.NET40.csproj
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/MahApps.Metro.Demo.NET40.csproj
@@ -143,7 +143,7 @@
   </Target>
   -->
   <Target AfterTargets="AfterBuild;NonWinFodyTarget" Name="CleanReferenceCopyLocalPaths" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Delete Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
+    <Delete Files="@(ReferenceCopyLocalPaths-&gt;'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
   </Target>
   <Import Project="..\..\..\.paket\paket.targets" />
   <Choose>
@@ -255,4 +255,4 @@
   </Choose>
   <Import Project="..\..\..\packages\Fody\build\$(__paket__Fody_targets).targets" Condition="Exists('..\..\..\packages\Fody\build\$(__paket__Fody_targets).targets')" Label="Paket" />
   <Import Project="..\..\..\packages\Microsoft.Bcl.Build\build\$(__paket__Microsoft_Bcl_Build_targets).targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build\build\$(__paket__Microsoft_Bcl_Build_targets).targets')" Label="Paket" />
-</Project>
\ No newline at end of file
+</Project>

From 2da98c3c8674ea7aa60d4a8226b09562b15e1dc4 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 11 May 2017 21:13:26 +0200
Subject: [PATCH 08/10] Update MahApps.Metro.Demo.NET40.csproj


From 79c03f7e44087266d2bd8deb384aa5ed6b2fb308 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 11 May 2017 21:13:46 +0200
Subject: [PATCH 09/10] Update MahApps.Metro.Demo.NET40.csproj

---
 .../MahApps.Metro.Demo.NET40/MahApps.Metro.Demo.NET40.csproj    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/MahApps.Metro.Demo.NET40.csproj b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/MahApps.Metro.Demo.NET40.csproj
index 63843c7b23..97a6187ba9 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/MahApps.Metro.Demo.NET40.csproj
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/MahApps.Metro.Demo.NET40.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>

From 4dea4841637dc1ed508928a9935203102587f20b Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 11 May 2017 21:14:06 +0200
Subject: [PATCH 10/10] Update MahApps.Metro.Demo.NET40.csproj