From efd877519efbb4e3e3441e659379db3741d7816d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B5=D0=BD=D0=B8=D1=81=20=D0=97=D0=B0=D0=BF=D0=BE?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B6=D0=B5=D1=86?= <mderkins@gmail.com>
Date: Mon, 6 Jul 2015 23:15:40 +0300
Subject: [PATCH 1/6] Remove hard coded margin from Expander and StatusBar
 styles

---
 MahApps.Metro/Styles/Controls.Expander.xaml  | 2 --
 MahApps.Metro/Styles/Controls.StatusBar.xaml | 2 --
 2 files changed, 4 deletions(-)

diff --git a/MahApps.Metro/Styles/Controls.Expander.xaml b/MahApps.Metro/Styles/Controls.Expander.xaml
index 44185ef0b3..b41c309348 100644
--- a/MahApps.Metro/Styles/Controls.Expander.xaml
+++ b/MahApps.Metro/Styles/Controls.Expander.xaml
@@ -352,8 +352,6 @@
 
     <Style x:Key="MetroExpander"
            TargetType="{x:Type Expander}">
-        <Setter Property="Margin"
-                Value="5" />
         <Setter Property="Padding"
                 Value="5" />
         <Setter Property="SnapsToDevicePixels"
diff --git a/MahApps.Metro/Styles/Controls.StatusBar.xaml b/MahApps.Metro/Styles/Controls.StatusBar.xaml
index 24345087a5..804695d58b 100644
--- a/MahApps.Metro/Styles/Controls.StatusBar.xaml
+++ b/MahApps.Metro/Styles/Controls.StatusBar.xaml
@@ -43,8 +43,6 @@
                 Value="1" />
         <Setter Property="MinHeight"
                 Value="1" />
-        <Setter Property="Margin"
-                Value="2" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Separator}">

From 05e2ab1da08ee87bdda3b70ae618f713dfe52ffb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B5=D0=BD=D0=B8=D1=81=20=D0=97=D0=B0=D0=BF=D0=BE?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B6=D0=B5=D1=86?= <mderkins@gmail.com>
Date: Mon, 6 Jul 2015 23:48:27 +0300
Subject: [PATCH 2/6] Implement new property for NumericUpDown -
 ButtonsPlacement to have possibility place buttons on the left side with
 reflection

---
 MahApps.Metro/Controls/NumericUpDown.cs       | 21 ++++++++++++++++---
 MahApps.Metro/Themes/NumericUpDown.xaml       | 12 ++++++++++-
 .../MetroDemo/ExampleViews/TextExamples.xaml  |  2 +-
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/MahApps.Metro/Controls/NumericUpDown.cs b/MahApps.Metro/Controls/NumericUpDown.cs
index 81accc6c7d..21f136e339 100644
--- a/MahApps.Metro/Controls/NumericUpDown.cs
+++ b/MahApps.Metro/Controls/NumericUpDown.cs
@@ -70,7 +70,13 @@ private static void IsReadOnlyPropertyChangedCallback(DependencyObject dependenc
             typeof(NumericUpDown),
             new FrameworkPropertyMetadata(default(double?), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged, CoerceValue));
 
-        public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(
+      public static readonly DependencyProperty ButtonsPlacementProperty = DependencyProperty.Register(
+           "ButtonsPlacement",
+           typeof(Dock),
+           typeof(NumericUpDown),
+           new FrameworkPropertyMetadata(Dock.Right, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
+
+      public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(
             "Minimum",
             typeof(double),
             typeof(NumericUpDown),
@@ -317,7 +323,16 @@ public double UpDownButtonsWidth
             set { SetValue(UpDownButtonsWidthProperty, value); }
         }
 
-        [Bindable(true)]
+      [Bindable(true)]
+      [Category("Appearance")]
+      [DefaultValue(Dock.Right)]
+      public Dock ButtonsPlacement
+      {
+         get { return (Dock)GetValue(ButtonsPlacementProperty); }
+         set { SetValue(ButtonsPlacementProperty, value); }
+      }
+
+      [Bindable(true)]
         [Category("Behavior")]
         [DefaultValue(DefaultInterval)]
         public double Interval
@@ -855,7 +870,7 @@ private static void OnValueChanged(DependencyObject d, DependencyPropertyChanged
             numericUpDown.OnValueChanged((double?)e.OldValue, (double?)e.NewValue);
         }
 
-        private static bool ValidateDelay(object value)
+      private static bool ValidateDelay(object value)
         {
             return Convert.ToInt32(value) >= 0;
         }
diff --git a/MahApps.Metro/Themes/NumericUpDown.xaml b/MahApps.Metro/Themes/NumericUpDown.xaml
index 7e26a938e0..82ea8f1e27 100644
--- a/MahApps.Metro/Themes/NumericUpDown.xaml
+++ b/MahApps.Metro/Themes/NumericUpDown.xaml
@@ -60,7 +60,7 @@
                                 Background="{TemplateBinding Background}" />
                         <Grid>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition />
+                                <ColumnDefinition x:Name="PART_TextBoxColumn" Width="*"/>
                                 <ColumnDefinition x:Name="PART_NumericUpColumn"
                                                   Width="Auto" />
                                 <ColumnDefinition x:Name="PART_NumericDownColumn"
@@ -128,6 +128,16 @@
                                 Opacity="0" />
                     </Grid>
                     <ControlTemplate.Triggers>
+                       <Trigger Property="ButtonsPlacement" Value="Left">
+                          <Setter TargetName="PART_TextBox" Property="Grid.Column" Value="2"/>
+                          <Setter TargetName="PART_NumericDown" Property="Grid.Column" Value="0"/>
+                          <Setter TargetName="PART_NumericDown" Property="Margin" Value="2,2,0,2"/>
+                          <Setter TargetName="PART_NumericUp" Property="Margin" Value="0,2,2,2"/>
+                          <Setter TargetName="PART_NumericUp" Property="Grid.Column" Value="1"/>
+                          <Setter TargetName="PART_NumericDownColumn" Property="Width" Value="*"/>
+                          <Setter TargetName="PART_NumericUpColumn" Property="Width" Value="Auto"/>
+                          <Setter TargetName="PART_TextBoxColumn" Property="Width" Value="Auto"/>
+                       </Trigger>
                         <Trigger Property="IsEnabled"
                                  Value="False">
                             <Setter TargetName="DisabledVisualElement"
diff --git a/samples/MetroDemo/ExampleViews/TextExamples.xaml b/samples/MetroDemo/ExampleViews/TextExamples.xaml
index e7cfe1b89f..560db1abc4 100644
--- a/samples/MetroDemo/ExampleViews/TextExamples.xaml
+++ b/samples/MetroDemo/ExampleViews/TextExamples.xaml
@@ -226,7 +226,7 @@
                                         Maximum="10" />
 
                 <Label Content='Interval="2"' />
-                <Controls:NumericUpDown Value="5"
+                <Controls:NumericUpDown Value="5" ButtonsPlacement="Left"
                                         IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
                                         Interval="2" />
 

From 04e6bef6cc4037858a48f76ce96cc5d8a20b2773 Mon Sep 17 00:00:00 2001
From: unknown <DZaporozhets@WS-DZAPOROZHETS.lohika.com>
Date: Tue, 7 Jul 2015 10:42:05 +0300
Subject: [PATCH 3/6] Create separate enum for ButtonPlacement and fix code
 style issues.

---
 .../Controls/ButtonsPlacementVariant.cs       |  8 ++++++
 MahApps.Metro/Controls/NumericUpDown.cs       | 26 +++++++++----------
 MahApps.Metro/MahApps.Metro.NET45.csproj      |  1 +
 MahApps.Metro/MahApps.Metro.csproj            |  1 +
 4 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 MahApps.Metro/Controls/ButtonsPlacementVariant.cs

diff --git a/MahApps.Metro/Controls/ButtonsPlacementVariant.cs b/MahApps.Metro/Controls/ButtonsPlacementVariant.cs
new file mode 100644
index 0000000000..9d3b957d4b
--- /dev/null
+++ b/MahApps.Metro/Controls/ButtonsPlacementVariant.cs
@@ -0,0 +1,8 @@
+namespace MahApps.Metro.Controls
+{
+   public enum ButtonsPlacementVariant
+   {
+      Left,
+      Right
+   }
+}
diff --git a/MahApps.Metro/Controls/NumericUpDown.cs b/MahApps.Metro/Controls/NumericUpDown.cs
index 21f136e339..7a6f9a68b7 100644
--- a/MahApps.Metro/Controls/NumericUpDown.cs
+++ b/MahApps.Metro/Controls/NumericUpDown.cs
@@ -70,13 +70,13 @@ private static void IsReadOnlyPropertyChangedCallback(DependencyObject dependenc
             typeof(NumericUpDown),
             new FrameworkPropertyMetadata(default(double?), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged, CoerceValue));
 
-      public static readonly DependencyProperty ButtonsPlacementProperty = DependencyProperty.Register(
+        public static readonly DependencyProperty ButtonsPlacementProperty = DependencyProperty.Register(
            "ButtonsPlacement",
-           typeof(Dock),
+           typeof(ButtonsPlacementVariant),
            typeof(NumericUpDown),
-           new FrameworkPropertyMetadata(Dock.Right, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
+           new FrameworkPropertyMetadata(ButtonsPlacementVariant.Right, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
 
-      public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(
+        public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(
             "Minimum",
             typeof(double),
             typeof(NumericUpDown),
@@ -323,16 +323,16 @@ public double UpDownButtonsWidth
             set { SetValue(UpDownButtonsWidthProperty, value); }
         }
 
-      [Bindable(true)]
-      [Category("Appearance")]
-      [DefaultValue(Dock.Right)]
-      public Dock ButtonsPlacement
-      {
-         get { return (Dock)GetValue(ButtonsPlacementProperty); }
-         set { SetValue(ButtonsPlacementProperty, value); }
-      }
+        [Bindable(true)]
+        [Category("Appearance")]
+        [DefaultValue(ButtonsPlacementVariant.Right)]
+        public Controls.ButtonsPlacementVariant ButtonsPlacement
+        {
+            get { return (ButtonsPlacementVariant)GetValue(ButtonsPlacementProperty); }
+            set { SetValue(ButtonsPlacementProperty, value); }
+        }
 
-      [Bindable(true)]
+        [Bindable(true)]
         [Category("Behavior")]
         [DefaultValue(DefaultInterval)]
         public double Interval
diff --git a/MahApps.Metro/MahApps.Metro.NET45.csproj b/MahApps.Metro/MahApps.Metro.NET45.csproj
index 1df2e27d17..3a32ca25f8 100644
--- a/MahApps.Metro/MahApps.Metro.NET45.csproj
+++ b/MahApps.Metro/MahApps.Metro.NET45.csproj
@@ -130,6 +130,7 @@
     <Compile Include="Behaviours\StylizedBehaviorCollection.cs" />
     <Compile Include="Behaviours\TabControlSelectFirstVisibleTabBehavior.cs" />
     <Compile Include="Behaviours\WindowsSettingBehaviour.cs" />
+    <Compile Include="Controls\ButtonsPlacementVariant.cs" />
     <Compile Include="Controls\Dialogs\DialogCoordinator.cs" />
     <Compile Include="Controls\Dialogs\DialogParticipation.cs" />
     <Compile Include="Controls\Dialogs\IDialogCoordinator.cs" />
diff --git a/MahApps.Metro/MahApps.Metro.csproj b/MahApps.Metro/MahApps.Metro.csproj
index bfb2fb1fe2..2e36e883ff 100644
--- a/MahApps.Metro/MahApps.Metro.csproj
+++ b/MahApps.Metro/MahApps.Metro.csproj
@@ -85,6 +85,7 @@
     <Compile Include="Actions\SetFlyoutOpenAction.cs" />
     <Compile Include="Behaviours\BindableResourceBehavior.cs" />
     <Compile Include="Behaviours\BorderlessWindowBehavior.cs" />
+    <Compile Include="Controls\ButtonsPlacementVariant.cs" />
     <Compile Include="Controls\Dialogs\DialogCoordinator.cs" />
     <Compile Include="Controls\Dialogs\DialogParticipation.cs" />
     <Compile Include="Behaviours\GlowWindowBehavior.cs" />

From 2747e0561d17de59352183105e93c2bdfb66869e Mon Sep 17 00:00:00 2001
From: unknown <DZaporozhets@WS-DZAPOROZHETS.lohika.com>
Date: Tue, 7 Jul 2015 12:56:04 +0300
Subject: [PATCH 4/6] Add placement attached property to TextBoxHelper to have
 possibility move close button to the left side.

---
 .../Controls/Helper/TextBoxHelper.cs          | 13 +++++++++++
 MahApps.Metro/Styles/Controls.TextBox.xaml    | 22 ++++++++++++++++---
 MahApps.Metro/Themes/NumericUpDown.xaml       | 11 +++++-----
 .../MetroDemo/ExampleViews/TextExamples.xaml  |  2 +-
 4 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/MahApps.Metro/Controls/Helper/TextBoxHelper.cs b/MahApps.Metro/Controls/Helper/TextBoxHelper.cs
index d3a2bf62b9..89301d7b23 100644
--- a/MahApps.Metro/Controls/Helper/TextBoxHelper.cs
+++ b/MahApps.Metro/Controls/Helper/TextBoxHelper.cs
@@ -22,6 +22,7 @@ public class TextBoxHelper
         public static readonly DependencyProperty UseFloatingWatermarkProperty = DependencyProperty.RegisterAttached("UseFloatingWatermark", typeof(bool), typeof(TextBoxHelper), new FrameworkPropertyMetadata(false, ButtonCommandOrClearTextChanged));
         public static readonly DependencyProperty TextLengthProperty = DependencyProperty.RegisterAttached("TextLength", typeof(int), typeof(TextBoxHelper), new UIPropertyMetadata(0));
         public static readonly DependencyProperty ClearTextButtonProperty = DependencyProperty.RegisterAttached("ClearTextButton", typeof(bool), typeof(TextBoxHelper), new FrameworkPropertyMetadata(false, ButtonCommandOrClearTextChanged));
+        public static readonly DependencyProperty ButtonsPlacementProperty = DependencyProperty.RegisterAttached("ButtonsPlacement", typeof(ButtonsPlacementVariant), typeof(TextBoxHelper), new FrameworkPropertyMetadata(ButtonsPlacementVariant.Right, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
         /// <summary>
         /// The clear text button behavior property. It sets a click event to the button if the value is true.
         /// </summary>
@@ -300,6 +301,16 @@ public static void SetClearTextButton(DependencyObject obj, bool value)
             obj.SetValue(ClearTextButtonProperty, value);
         }
 
+        public static ButtonsPlacementVariant GetButtonsPlacement(DependencyObject d)
+        {
+           return (ButtonsPlacementVariant)d.GetValue(ButtonsPlacementProperty);
+        }
+
+        public static void SetButtonsPlacement(DependencyObject obj, ButtonsPlacementVariant value)
+        {
+           obj.SetValue(ButtonsPlacementProperty, value);
+        }
+
         /// <summary>
         /// Gets the clear text button behavior.
         /// </summary>
@@ -318,6 +329,8 @@ public static void SetIsClearTextButtonBehaviorEnabled(Button obj, bool value)
             obj.SetValue(IsClearTextButtonBehaviorEnabledProperty, value);
         }
 
+        
+
         public static ICommand GetButtonCommand(DependencyObject d)
         {
             return (ICommand)d.GetValue(ButtonCommandProperty);
diff --git a/MahApps.Metro/Styles/Controls.TextBox.xaml b/MahApps.Metro/Styles/Controls.TextBox.xaml
index b539993218..999d1e32ef 100644
--- a/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -85,7 +85,7 @@
                         <Grid x:Name="PART_InnerGrid"
                               Margin="2">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" x:Name="TextColumn"/>
                                 <ColumnDefinition x:Name="ButtonColumn"
                                                   Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ButtonWidth), Mode=OneWay}" />
                             </Grid.ColumnDefinitions>
@@ -161,6 +161,14 @@
                                 Opacity="0" />
                     </Grid>
                     <ControlTemplate.Triggers>
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsPlacement)}"
+                                     Value="Left">
+                           <Setter TargetName="PART_ClearText" Property="Grid.Column" Value="0"/>
+                           <Setter TargetName="Message" Property="Grid.Column" Value="1"/>
+                           <Setter TargetName="TextColumn" Property="Width" Value="Auto"/>
+                           <Setter TargetName="ButtonColumn" Property="Width" Value="*"/>
+                        </DataTrigger>
+                       
                         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Text}"
                                      Value="">
                             <Setter TargetName="Message"
@@ -381,7 +389,7 @@
                         <Grid x:Name="PART_InnerGrid"
                               Margin="2">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" x:Name="TextColumn" />
                                 <ColumnDefinition x:Name="ButtonColumn"
                                                   Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ButtonWidth), Mode=OneWay}" />
                             </Grid.ColumnDefinitions>
@@ -457,8 +465,16 @@
                                 Opacity="0" />
                     </Grid>
                     <ControlTemplate.Triggers>
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsPlacement)}"
+                                           Value="Left">
+                           <Setter TargetName="PART_ClearText" Property="Grid.Column" Value="0"/>
+                           <Setter TargetName="Message" Property="Grid.Column" Value="1"/>
+                           <Setter TargetName="TextColumn" Property="Width" Value="Auto"/>
+                           <Setter TargetName="ButtonColumn" Property="Width" Value="*"/>
+                        </DataTrigger>
+
                         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Text}"
-                                     Value="">
+                                           Value="">
                             <Setter TargetName="Message"
                                     Property="Visibility"
                                     Value="Visible" />
diff --git a/MahApps.Metro/Themes/NumericUpDown.xaml b/MahApps.Metro/Themes/NumericUpDown.xaml
index 82ea8f1e27..5ddae9a774 100644
--- a/MahApps.Metro/Themes/NumericUpDown.xaml
+++ b/MahApps.Metro/Themes/NumericUpDown.xaml
@@ -85,7 +85,8 @@
                                      FontFamily="{TemplateBinding FontFamily}"
                                      FontSize="{TemplateBinding FontSize}"
                                      Controls:TextBoxHelper.ClearTextButton="{TemplateBinding Controls:TextBoxHelper.ClearTextButton}"
-                                     Controls:TextBoxHelper.Watermark="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
+                                     Controls:TextBoxHelper.Watermark="{TemplateBinding Controls:TextBoxHelper.Watermark}"
+                                     Controls:TextBoxHelper.ButtonsPlacement="{TemplateBinding ButtonsPlacement}"/>
                             <RepeatButton x:Name="PART_NumericUp"
                                           Grid.Column="1"
                                           Margin="2,2,0,2"
@@ -130,10 +131,10 @@
                     <ControlTemplate.Triggers>
                        <Trigger Property="ButtonsPlacement" Value="Left">
                           <Setter TargetName="PART_TextBox" Property="Grid.Column" Value="2"/>
-                          <Setter TargetName="PART_NumericDown" Property="Grid.Column" Value="0"/>
-                          <Setter TargetName="PART_NumericDown" Property="Margin" Value="2,2,0,2"/>
-                          <Setter TargetName="PART_NumericUp" Property="Margin" Value="0,2,2,2"/>
-                          <Setter TargetName="PART_NumericUp" Property="Grid.Column" Value="1"/>
+                          <Setter TargetName="PART_NumericDown" Property="Grid.Column" Value="1"/>
+                          <Setter TargetName="PART_NumericDown" Property="Margin" Value="0,2,2,2"/>
+                          <Setter TargetName="PART_NumericUp" Property="Margin" Value="2,2,0,2"/>
+                          <Setter TargetName="PART_NumericUp" Property="Grid.Column" Value="0"/>
                           <Setter TargetName="PART_NumericDownColumn" Property="Width" Value="*"/>
                           <Setter TargetName="PART_NumericUpColumn" Property="Width" Value="Auto"/>
                           <Setter TargetName="PART_TextBoxColumn" Property="Width" Value="Auto"/>
diff --git a/samples/MetroDemo/ExampleViews/TextExamples.xaml b/samples/MetroDemo/ExampleViews/TextExamples.xaml
index 560db1abc4..12f6b5966c 100644
--- a/samples/MetroDemo/ExampleViews/TextExamples.xaml
+++ b/samples/MetroDemo/ExampleViews/TextExamples.xaml
@@ -233,7 +233,7 @@
                 <Label Content='Interval="5"' />
                 <Controls:NumericUpDown Value="5"
                                         IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
-                                        Controls:TextBoxHelper.ClearTextButton="True"
+                                        Controls:TextBoxHelper.ClearTextButton="True" ButtonsPlacement="Left"
                                         Interval="5" />
 
                 <Controls:NumericUpDown Margin="{StaticResource ControlMargin}"

From 97abae293c4ef691adc908c3ac0835a796fd8d00 Mon Sep 17 00:00:00 2001
From: unknown <DZaporozhets@WS-DZAPOROZHETS.lohika.com>
Date: Tue, 7 Jul 2015 13:41:20 +0300
Subject: [PATCH 5/6] some updates to template

---
 MahApps.Metro/Styles/Controls.TextBox.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MahApps.Metro/Styles/Controls.TextBox.xaml b/MahApps.Metro/Styles/Controls.TextBox.xaml
index 999d1e32ef..b6ff36bb7e 100644
--- a/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -167,6 +167,7 @@
                            <Setter TargetName="Message" Property="Grid.Column" Value="1"/>
                            <Setter TargetName="TextColumn" Property="Width" Value="Auto"/>
                            <Setter TargetName="ButtonColumn" Property="Width" Value="*"/>
+                           <Setter TargetName="PART_ContentHost" Property="Grid.Column" Value="1"/>
                         </DataTrigger>
                        
                         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Text}"

From 755d04084142f4bcbed3557063ed16c3c708b763 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Wed, 8 Jul 2015 13:07:58 +0200
Subject: [PATCH 6/6] changes for TextBox ButtonsPlacement usage

---
 .../Controls/Helper/TextBoxHelper.cs          |  8 +-
 MahApps.Metro/Controls/NumericUpDown.cs       |  2 +-
 MahApps.Metro/Styles/Controls.TextBox.xaml    | 93 ++++++++++---------
 MahApps.Metro/Themes/NumericUpDown.xaml       | 42 ++++++---
 4 files changed, 87 insertions(+), 58 deletions(-)

diff --git a/MahApps.Metro/Controls/Helper/TextBoxHelper.cs b/MahApps.Metro/Controls/Helper/TextBoxHelper.cs
index 89301d7b23..8cfc4d0c35 100644
--- a/MahApps.Metro/Controls/Helper/TextBoxHelper.cs
+++ b/MahApps.Metro/Controls/Helper/TextBoxHelper.cs
@@ -22,7 +22,7 @@ public class TextBoxHelper
         public static readonly DependencyProperty UseFloatingWatermarkProperty = DependencyProperty.RegisterAttached("UseFloatingWatermark", typeof(bool), typeof(TextBoxHelper), new FrameworkPropertyMetadata(false, ButtonCommandOrClearTextChanged));
         public static readonly DependencyProperty TextLengthProperty = DependencyProperty.RegisterAttached("TextLength", typeof(int), typeof(TextBoxHelper), new UIPropertyMetadata(0));
         public static readonly DependencyProperty ClearTextButtonProperty = DependencyProperty.RegisterAttached("ClearTextButton", typeof(bool), typeof(TextBoxHelper), new FrameworkPropertyMetadata(false, ButtonCommandOrClearTextChanged));
-        public static readonly DependencyProperty ButtonsPlacementProperty = DependencyProperty.RegisterAttached("ButtonsPlacement", typeof(ButtonsPlacementVariant), typeof(TextBoxHelper), new FrameworkPropertyMetadata(ButtonsPlacementVariant.Right, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
+        public static readonly DependencyProperty ButtonsPlacementProperty = DependencyProperty.RegisterAttached("ButtonsPlacement", typeof(ButtonsPlacementVariant), typeof(TextBoxHelper), new FrameworkPropertyMetadata(ButtonsPlacementVariant.Right, FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure));
         /// <summary>
         /// The clear text button behavior property. It sets a click event to the button if the value is true.
         /// </summary>
@@ -301,11 +301,17 @@ public static void SetClearTextButton(DependencyObject obj, bool value)
             obj.SetValue(ClearTextButtonProperty, value);
         }
 
+        /// <summary>
+        /// Gets the buttons placement variant.
+        /// </summary>
         public static ButtonsPlacementVariant GetButtonsPlacement(DependencyObject d)
         {
            return (ButtonsPlacementVariant)d.GetValue(ButtonsPlacementProperty);
         }
 
+        /// <summary>
+        /// Sets the buttons placement variant.
+        /// </summary>
         public static void SetButtonsPlacement(DependencyObject obj, ButtonsPlacementVariant value)
         {
            obj.SetValue(ButtonsPlacementProperty, value);
diff --git a/MahApps.Metro/Controls/NumericUpDown.cs b/MahApps.Metro/Controls/NumericUpDown.cs
index 7a6f9a68b7..f0a557a394 100644
--- a/MahApps.Metro/Controls/NumericUpDown.cs
+++ b/MahApps.Metro/Controls/NumericUpDown.cs
@@ -74,7 +74,7 @@ private static void IsReadOnlyPropertyChangedCallback(DependencyObject dependenc
            "ButtonsPlacement",
            typeof(ButtonsPlacementVariant),
            typeof(NumericUpDown),
-           new FrameworkPropertyMetadata(ButtonsPlacementVariant.Right, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
+           new FrameworkPropertyMetadata(ButtonsPlacementVariant.Right, FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure));
 
         public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(
             "Minimum",
diff --git a/MahApps.Metro/Styles/Controls.TextBox.xaml b/MahApps.Metro/Styles/Controls.TextBox.xaml
index b6ff36bb7e..156b6d4468 100644
--- a/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -85,9 +85,10 @@
                         <Grid x:Name="PART_InnerGrid"
                               Margin="2">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" x:Name="TextColumn"/>
+                                <ColumnDefinition Width="*"
+                                                  x:Name="TextColumn" />
                                 <ColumnDefinition x:Name="ButtonColumn"
-                                                  Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ButtonWidth), Mode=OneWay}" />
+                                                  Width="Auto" />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
@@ -149,6 +150,7 @@
                                     Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ButtonContent), Mode=OneWay}"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay}"
+                                    Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ButtonWidth), Mode=OneWay}"
                                     IsTabStop="False" />
                         </Grid>
                         <Border x:Name="DisabledVisualElement"
@@ -163,13 +165,23 @@
                     <ControlTemplate.Triggers>
                         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsPlacement)}"
                                      Value="Left">
-                           <Setter TargetName="PART_ClearText" Property="Grid.Column" Value="0"/>
-                           <Setter TargetName="Message" Property="Grid.Column" Value="1"/>
-                           <Setter TargetName="TextColumn" Property="Width" Value="Auto"/>
-                           <Setter TargetName="ButtonColumn" Property="Width" Value="*"/>
-                           <Setter TargetName="PART_ContentHost" Property="Grid.Column" Value="1"/>
+                            <Setter TargetName="PART_ClearText"
+                                    Property="Grid.Column"
+                                    Value="0" />
+                            <Setter TargetName="Message"
+                                    Property="Grid.Column"
+                                    Value="1" />
+                            <Setter TargetName="TextColumn"
+                                    Property="Width"
+                                    Value="Auto" />
+                            <Setter TargetName="ButtonColumn"
+                                    Property="Width"
+                                    Value="*" />
+                            <Setter TargetName="PART_ContentHost"
+                                    Property="Grid.Column"
+                                    Value="1" />
                         </DataTrigger>
-                       
+
                         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Text}"
                                      Value="">
                             <Setter TargetName="Message"
@@ -208,28 +220,21 @@
                             </DataTrigger.ExitActions>
                         </DataTrigger>
 
-                        <!-- multiline textbox cannot bind to actual height so take the fallbach button width -->
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="TextWrapping"
-                                           Value="NoWrap" />
-                                <Condition Property="AcceptsReturn"
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsPlacement)}"
+                                           Value="Right" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ClearTextButton)}"
                                            Value="False" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="ButtonColumn"
-                                    Property="Width"
-                                    Value="{Binding ElementName=ButtonRow, Path=ActualHeight, Mode=OneWay}" />
-                        </MultiTrigger>
-
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ClearTextButton)}"
-                                     Value="False">
+                            </MultiDataTrigger.Conditions>
                             <Setter TargetName="PART_ContentHost"
                                     Property="Grid.ColumnSpan"
                                     Value="2" />
                             <Setter TargetName="Message"
                                     Property="Grid.ColumnSpan"
                                     Value="2" />
-                        </DataTrigger>
+                        </MultiDataTrigger>
+
                         <Trigger Property="IsMouseOver"
                                  Value="True">
                             <Setter TargetName="Base"
@@ -390,9 +395,10 @@
                         <Grid x:Name="PART_InnerGrid"
                               Margin="2">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" x:Name="TextColumn" />
+                                <ColumnDefinition Width="*"
+                                                  x:Name="TextColumn" />
                                 <ColumnDefinition x:Name="ButtonColumn"
-                                                  Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ButtonWidth), Mode=OneWay}" />
+                                                  Width="Auto" />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
@@ -454,6 +460,7 @@
                                     Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ButtonContent), Mode=OneWay}"
                                     Template="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ButtonTemplate), Mode=OneWay}"
                                     Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="True"
+                                    Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ButtonWidth), Mode=OneWay}"
                                     IsTabStop="False" />
                         </Grid>
                         <Border x:Name="DisabledVisualElement"
@@ -467,15 +474,26 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsPlacement)}"
-                                           Value="Left">
-                           <Setter TargetName="PART_ClearText" Property="Grid.Column" Value="0"/>
-                           <Setter TargetName="Message" Property="Grid.Column" Value="1"/>
-                           <Setter TargetName="TextColumn" Property="Width" Value="Auto"/>
-                           <Setter TargetName="ButtonColumn" Property="Width" Value="*"/>
+                                     Value="Left">
+                            <Setter TargetName="PART_ClearText"
+                                    Property="Grid.Column"
+                                    Value="0" />
+                            <Setter TargetName="Message"
+                                    Property="Grid.Column"
+                                    Value="1" />
+                            <Setter TargetName="TextColumn"
+                                    Property="Width"
+                                    Value="Auto" />
+                            <Setter TargetName="ButtonColumn"
+                                    Property="Width"
+                                    Value="*" />
+                            <Setter TargetName="PART_ContentHost"
+                                    Property="Grid.Column"
+                                    Value="1" />
                         </DataTrigger>
 
                         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Text}"
-                                           Value="">
+                                     Value="">
                             <Setter TargetName="Message"
                                     Property="Visibility"
                                     Value="Visible" />
@@ -512,19 +530,6 @@
                             </DataTrigger.ExitActions>
                         </DataTrigger>
 
-                        <!-- multiline textbox cannot bind to actual height so take the fallbach button width -->
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="TextWrapping"
-                                           Value="NoWrap" />
-                                <Condition Property="AcceptsReturn"
-                                           Value="False" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="ButtonColumn"
-                                    Property="Width"
-                                    Value="{Binding ElementName=ButtonRow, Path=ActualHeight, Mode=OneWay}" />
-                        </MultiTrigger>
-
                         <Trigger Property="IsMouseOver"
                                  Value="True">
                             <Setter TargetName="Base"
diff --git a/MahApps.Metro/Themes/NumericUpDown.xaml b/MahApps.Metro/Themes/NumericUpDown.xaml
index 5ddae9a774..c302e1d298 100644
--- a/MahApps.Metro/Themes/NumericUpDown.xaml
+++ b/MahApps.Metro/Themes/NumericUpDown.xaml
@@ -60,7 +60,8 @@
                                 Background="{TemplateBinding Background}" />
                         <Grid>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition x:Name="PART_TextBoxColumn" Width="*"/>
+                                <ColumnDefinition x:Name="PART_TextBoxColumn"
+                                                  Width="*" />
                                 <ColumnDefinition x:Name="PART_NumericUpColumn"
                                                   Width="Auto" />
                                 <ColumnDefinition x:Name="PART_NumericDownColumn"
@@ -86,7 +87,7 @@
                                      FontSize="{TemplateBinding FontSize}"
                                      Controls:TextBoxHelper.ClearTextButton="{TemplateBinding Controls:TextBoxHelper.ClearTextButton}"
                                      Controls:TextBoxHelper.Watermark="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                     Controls:TextBoxHelper.ButtonsPlacement="{TemplateBinding ButtonsPlacement}"/>
+                                     Controls:TextBoxHelper.ButtonsPlacement="{TemplateBinding ButtonsPlacement}" />
                             <RepeatButton x:Name="PART_NumericUp"
                                           Grid.Column="1"
                                           Margin="2,2,0,2"
@@ -129,16 +130,33 @@
                                 Opacity="0" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                       <Trigger Property="ButtonsPlacement" Value="Left">
-                          <Setter TargetName="PART_TextBox" Property="Grid.Column" Value="2"/>
-                          <Setter TargetName="PART_NumericDown" Property="Grid.Column" Value="1"/>
-                          <Setter TargetName="PART_NumericDown" Property="Margin" Value="0,2,2,2"/>
-                          <Setter TargetName="PART_NumericUp" Property="Margin" Value="2,2,0,2"/>
-                          <Setter TargetName="PART_NumericUp" Property="Grid.Column" Value="0"/>
-                          <Setter TargetName="PART_NumericDownColumn" Property="Width" Value="*"/>
-                          <Setter TargetName="PART_NumericUpColumn" Property="Width" Value="Auto"/>
-                          <Setter TargetName="PART_TextBoxColumn" Property="Width" Value="Auto"/>
-                       </Trigger>
+                        <Trigger Property="ButtonsPlacement"
+                                 Value="Left">
+                            <Setter TargetName="PART_TextBox"
+                                    Property="Grid.Column"
+                                    Value="2" />
+                            <Setter TargetName="PART_NumericDown"
+                                    Property="Grid.Column"
+                                    Value="1" />
+                            <Setter TargetName="PART_NumericDown"
+                                    Property="Margin"
+                                    Value="0,2,2,2" />
+                            <Setter TargetName="PART_NumericUp"
+                                    Property="Margin"
+                                    Value="2,2,0,2" />
+                            <Setter TargetName="PART_NumericUp"
+                                    Property="Grid.Column"
+                                    Value="0" />
+                            <Setter TargetName="PART_NumericDownColumn"
+                                    Property="Width"
+                                    Value="*" />
+                            <Setter TargetName="PART_NumericUpColumn"
+                                    Property="Width"
+                                    Value="Auto" />
+                            <Setter TargetName="PART_TextBoxColumn"
+                                    Property="Width"
+                                    Value="Auto" />
+                        </Trigger>
                         <Trigger Property="IsEnabled"
                                  Value="False">
                             <Setter TargetName="DisabledVisualElement"