From 9fba30cb7799bbd35599361d93e8d71d2a2f8df6 Mon Sep 17 00:00:00 2001
From: Adolfo Marinucci <adospace@msn.com>
Date: Fri, 19 Feb 2021 10:20:22 +0100
Subject: [PATCH] TextBox and NumberBox don't honor
 Vertical/HorizontalContentAlignment

---
 ModernWpf.Controls/NumberBox/NumberBox.xaml | 6 +++++-
 ModernWpf/Styles/TextBox.xaml               | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ModernWpf.Controls/NumberBox/NumberBox.xaml b/ModernWpf.Controls/NumberBox/NumberBox.xaml
index 4e4609b1..c04d452f 100644
--- a/ModernWpf.Controls/NumberBox/NumberBox.xaml
+++ b/ModernWpf.Controls/NumberBox/NumberBox.xaml
@@ -174,6 +174,8 @@
                             Text="{TemplateBinding ui:ControlHelper.PlaceholderText}"
                             TextAlignment="{TemplateBinding TextAlignment}"
                             TextWrapping="{TemplateBinding TextWrapping}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             IsHitTestVisible="False" />
                         <Button
                             x:Name="DeleteButton"
@@ -332,7 +334,7 @@
 
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
 
@@ -367,6 +369,8 @@
                             FontWeight="{TemplateBinding FontWeight}"
                             FontFamily="{TemplateBinding FontFamily}"
                             TextAlignment="{TemplateBinding TextAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                             ui:ControlHelper.CornerRadius="{TemplateBinding CornerRadius}" />
 
                         <Popup
diff --git a/ModernWpf/Styles/TextBox.xaml b/ModernWpf/Styles/TextBox.xaml
index a4cde806..6d64c6b2 100644
--- a/ModernWpf/Styles/TextBox.xaml
+++ b/ModernWpf/Styles/TextBox.xaml
@@ -158,6 +158,8 @@
                             Text="{TemplateBinding primitives:ControlHelper.PlaceholderText}"
                             TextAlignment="{TemplateBinding TextAlignment}"
                             TextWrapping="{TemplateBinding TextWrapping}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"                            
                             IsHitTestVisible="False" />
                         <Button
                             x:Name="DeleteButton"