From f4fe0b126cce57a37cfd32cf88515c54c1ced7ab Mon Sep 17 00:00:00 2001
From: Symbai <14368203+Symbai@users.noreply.github.com>
Date: Fri, 14 Feb 2020 18:40:27 +0100
Subject: [PATCH 1/5] init

---
 src/Avalonia.Controls/TextBox.cs         | 24 ++++++++++++++++++++++++
 src/Avalonia.Themes.Default/TextBox.xaml |  5 +++++
 2 files changed, 29 insertions(+)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index b561a3423f..e38cf7955f 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -14,6 +14,7 @@ using Avalonia.Interactivity;
 using Avalonia.Media;
 using Avalonia.Metadata;
 using Avalonia.Data;
+using Avalonia.Layout;
 using Avalonia.Utilities;
 
 namespace Avalonia.Controls
@@ -72,6 +73,18 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<TextAlignment> TextAlignmentProperty =
             TextBlock.TextAlignmentProperty.AddOwner<TextBox>();
 
+        /// <summary>
+        /// Defines the <see cref="HorizontalAlignment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<HorizontalAlignment> HorizontalContentAlignmentProperty =
+            AvaloniaProperty.Register<TextBox, HorizontalAlignment>(nameof(HorizontalContentAlignment));
+
+        /// <summary>
+        /// Defines the <see cref="VerticalAlignment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<VerticalAlignment> VerticalContentAlignmentProperty =
+            AvaloniaProperty.Register<TextBox, VerticalAlignment>(nameof(VerticalContentAlignment));
+
         public static readonly StyledProperty<TextWrapping> TextWrappingProperty =
             TextBlock.TextWrappingProperty.AddOwner<TextBox>();
 
@@ -262,6 +275,17 @@ namespace Avalonia.Controls
             }
         }
 
+        public HorizontalAlignment HorizontalContentAlignment
+        {
+            get { return GetValue(HorizontalContentAlignmentProperty); }
+            set { SetValue(HorizontalContentAlignmentProperty, value); }
+        }
+        public VerticalAlignment VerticalContentAlignment
+        {
+            get { return GetValue(VerticalContentAlignmentProperty); }
+            set { SetValue(VerticalContentAlignmentProperty, value); }
+        }
+
         public TextAlignment TextAlignment
         {
             get { return GetValue(TextAlignmentProperty); }
diff --git a/src/Avalonia.Themes.Default/TextBox.xaml b/src/Avalonia.Themes.Default/TextBox.xaml
index 423d19da14..53c262c4fe 100644
--- a/src/Avalonia.Themes.Default/TextBox.xaml
+++ b/src/Avalonia.Themes.Default/TextBox.xaml
@@ -15,6 +15,7 @@
           <DockPanel Margin="{TemplateBinding Padding}">
 
             <TextBlock Name="floatingWatermark"
+                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                        Foreground="{DynamicResource ThemeAccentBrush}"
                        FontSize="{DynamicResource FontSizeSmall}"
                        Text="{TemplateBinding Watermark}"
@@ -37,9 +38,13 @@
                 <Panel>
                   <TextBlock Name="watermark"
                              Opacity="0.5"
+                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                              Text="{TemplateBinding Watermark}"
                              IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.IsNullOrEmpty}}"/>
                   <TextPresenter Name="PART_TextPresenter"
+                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                  Text="{TemplateBinding Text, Mode=TwoWay}"
                                  CaretIndex="{TemplateBinding CaretIndex}"
                                  SelectionStart="{TemplateBinding SelectionStart}"

From 6fe5892ad90695458ccdebd3cd597e5be5e0431f Mon Sep 17 00:00:00 2001
From: Symbai <14368203+Symbai@users.noreply.github.com>
Date: Fri, 14 Feb 2020 18:48:52 +0100
Subject: [PATCH 2/5] Include vertical alignment of floating watermark

---
 src/Avalonia.Themes.Default/TextBox.xaml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Themes.Default/TextBox.xaml b/src/Avalonia.Themes.Default/TextBox.xaml
index 53c262c4fe..2c4cafde26 100644
--- a/src/Avalonia.Themes.Default/TextBox.xaml
+++ b/src/Avalonia.Themes.Default/TextBox.xaml
@@ -12,10 +12,11 @@
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}">
-          <DockPanel Margin="{TemplateBinding Padding}">
+          <DockPanel Margin="{TemplateBinding Padding}"
+                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
 
             <TextBlock Name="floatingWatermark"
-                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                        Foreground="{DynamicResource ThemeAccentBrush}"
                        FontSize="{DynamicResource FontSizeSmall}"
                        Text="{TemplateBinding Watermark}"
@@ -38,13 +39,9 @@
                 <Panel>
                   <TextBlock Name="watermark"
                              Opacity="0.5"
-                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                              Text="{TemplateBinding Watermark}"
                              IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.IsNullOrEmpty}}"/>
                   <TextPresenter Name="PART_TextPresenter"
-                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                  Text="{TemplateBinding Text, Mode=TwoWay}"
                                  CaretIndex="{TemplateBinding CaretIndex}"
                                  SelectionStart="{TemplateBinding SelectionStart}"

From b814eaac99eef60270563ad5ed0788e9ea5c18ae Mon Sep 17 00:00:00 2001
From: Symbai <14368203+Symbai@users.noreply.github.com>
Date: Fri, 14 Feb 2020 22:25:10 +0100
Subject: [PATCH 3/5] inherit from ContentControl

---
 src/Avalonia.Controls/TextBox.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index e38cf7955f..dfbdcd16d8 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -77,13 +77,13 @@ namespace Avalonia.Controls
         /// Defines the <see cref="HorizontalAlignment"/> property.
         /// </summary>
         public static readonly StyledProperty<HorizontalAlignment> HorizontalContentAlignmentProperty =
-            AvaloniaProperty.Register<TextBox, HorizontalAlignment>(nameof(HorizontalContentAlignment));
+            ContentControl.HorizontalContentAlignmentProperty.AddOwner<TextBox>();
 
         /// <summary>
         /// Defines the <see cref="VerticalAlignment"/> property.
         /// </summary>
         public static readonly StyledProperty<VerticalAlignment> VerticalContentAlignmentProperty =
-            AvaloniaProperty.Register<TextBox, VerticalAlignment>(nameof(VerticalContentAlignment));
+            ContentControl.VerticalContentAlignmentProperty.AddOwner<TextBox>();
 
         public static readonly StyledProperty<TextWrapping> TextWrappingProperty =
             TextBlock.TextWrappingProperty.AddOwner<TextBox>();

From dc8881c846cc1d7853735a7521cbd697319b2624 Mon Sep 17 00:00:00 2001
From: Symbai <14368203+Symbai@users.noreply.github.com>
Date: Fri, 14 Feb 2020 23:37:11 +0100
Subject: [PATCH 4/5] Update TextBox.cs

---
 src/Avalonia.Controls/TextBox.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index dfbdcd16d8..d20d8a3647 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -275,11 +275,17 @@ namespace Avalonia.Controls
             }
         }
 
+        /// <summary>
+        /// Gets or sets the horizontal alignment of the content within the control.
+        /// </summary>
         public HorizontalAlignment HorizontalContentAlignment
         {
             get { return GetValue(HorizontalContentAlignmentProperty); }
             set { SetValue(HorizontalContentAlignmentProperty, value); }
         }
+        /// <summary>
+        /// Gets or sets the vertical alignment of the content within the control.
+        /// </summary>
         public VerticalAlignment VerticalContentAlignment
         {
             get { return GetValue(VerticalContentAlignmentProperty); }

From 994def4642ef9259a1718f35694481e6ffe3ca45 Mon Sep 17 00:00:00 2001
From: Symbai <14368203+Symbai@users.noreply.github.com>
Date: Sat, 15 Feb 2020 00:09:33 +0100
Subject: [PATCH 5/5] Update TextBox.cs

---
 src/Avalonia.Controls/TextBox.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index d20d8a3647..437b24dd9e 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -283,6 +283,7 @@ namespace Avalonia.Controls
             get { return GetValue(HorizontalContentAlignmentProperty); }
             set { SetValue(HorizontalContentAlignmentProperty, value); }
         }
+
         /// <summary>
         /// Gets or sets the vertical alignment of the content within the control.
         /// </summary>