From dc5054e770c954dfb86f66734c04f138e51205dd Mon Sep 17 00:00:00 2001
From: brianlagunas_cp <XceedBoucherS@users.noreply.github.com>
Date: Mon, 28 Mar 2011 14:03:49 +0000
Subject: [PATCH] MaskedTextBox, NumericUpDown, DateTimeUpDown: fixed bug where
 HorizontalCOntentALignment would have no effect.

---
 .../WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml  | 6 ++++--
 .../WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml   | 1 +
 .../WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml   | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
index efff105c..27004fc9 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
@@ -9,7 +9,8 @@
     <Style TargetType="{x:Type local:DateTimeUpDown}">
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Focusable" Value="False" />
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>        
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
+        <Setter Property="HorizontalContentAlignment" Value="Right" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:DateTimeUpDown}">
@@ -23,9 +24,10 @@
                                  FontStyle="{TemplateBinding FontStyle}" 
                                  FontWeight="{TemplateBinding FontWeight}" 
                                  Foreground="{TemplateBinding Foreground}" 
+                                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                  IsReadOnly="True"
                                  MinWidth="20" AcceptsReturn="False" 
-                                 TextAlignment="Right" TextWrapping="NoWrap" 
+                                 TextWrapping="NoWrap" 
                                  TabIndex="{TemplateBinding TabIndex}"
                                  Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}" />
                     </local:ButtonSpinner>
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml
index 8743492f..7d582d12 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml
@@ -24,6 +24,7 @@
                              FontStyle="{TemplateBinding FontStyle}" 
                              FontWeight="{TemplateBinding FontWeight}" 
                              Foreground="{TemplateBinding Foreground}"
+                             HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                              IsReadOnly="{Binding IsEditable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
                              MinWidth="20" AcceptsReturn="False" TextWrapping="NoWrap" 
                              TabIndex="{TemplateBinding TabIndex}"
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml
index ff540ba1..4ff4b52c 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml
@@ -13,6 +13,7 @@
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
+        <Setter Property="HorizontalContentAlignment" Value="Right" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:NumericUpDown}">
@@ -26,9 +27,10 @@
                                  FontStyle="{TemplateBinding FontStyle}" 
                                  FontWeight="{TemplateBinding FontWeight}" 
                                  Foreground="{TemplateBinding Foreground}" 
+                                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                  IsReadOnly="{Binding IsEditable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
                                  MinWidth="20" AcceptsReturn="False" 
-                                 TextAlignment="Right" TextWrapping="NoWrap" 
+                                 TextWrapping="NoWrap" 
                                  TabIndex="{TemplateBinding TabIndex}"
                                  Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}" />
                     </local:ButtonSpinner>