From a4a2387e20f282974faf2d53a787fd094d83c252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20R=C3=BChl?= <dev.ruehl@gmail.com>
Date: Thu, 15 Oct 2020 00:24:26 +0200
Subject: [PATCH] Fix watermark alignment

Fix alignment of watermark hosts in text boxes, combo boxes and date pickers. Watermarks did not respect content alignment properties resulting in misplaced watermarks when the controls' heights were specified explicitly.
---
 src/AdonisUI.ClassicTheme/DefaultStyles/ComboBox.xaml   | 4 ++--
 src/AdonisUI.ClassicTheme/DefaultStyles/DatePicker.xaml | 4 ++--
 src/AdonisUI.ClassicTheme/DefaultStyles/TextBox.xaml    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/AdonisUI.ClassicTheme/DefaultStyles/ComboBox.xaml b/src/AdonisUI.ClassicTheme/DefaultStyles/ComboBox.xaml
index be873fc..5608fc1 100644
--- a/src/AdonisUI.ClassicTheme/DefaultStyles/ComboBox.xaml
+++ b/src/AdonisUI.ClassicTheme/DefaultStyles/ComboBox.xaml
@@ -274,8 +274,8 @@
                                             <Grid>
                                                 <ContentPresenter x:Name="PlaceholderHost"
                                                                   Content="{Binding Path=(adonisExtensions:WatermarkExtension.Watermark), RelativeSource={RelativeSource FindAncestor, AncestorType=ComboBox}}"
-                                                                  HorizontalAlignment="Stretch"
-                                                                  VerticalAlignment="Stretch"
+                                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                                                   Opacity="0.5"
                                                                   IsHitTestVisible="False"
                                                                   Visibility="Collapsed"/>
diff --git a/src/AdonisUI.ClassicTheme/DefaultStyles/DatePicker.xaml b/src/AdonisUI.ClassicTheme/DefaultStyles/DatePicker.xaml
index 9761e3c..d9c99dc 100644
--- a/src/AdonisUI.ClassicTheme/DefaultStyles/DatePicker.xaml
+++ b/src/AdonisUI.ClassicTheme/DefaultStyles/DatePicker.xaml
@@ -22,8 +22,8 @@
                         <ContentPresenter x:Name="PlaceholderHost"
                                           Content="{Binding Path=(adonisExtensions:WatermarkExtension.Watermark), RelativeSource={RelativeSource FindAncestor, AncestorType=DatePicker}}"
                                           Margin="{TemplateBinding Padding}"
-                                          HorizontalAlignment="Stretch"
-                                          VerticalAlignment="Stretch"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                           Opacity="0.5"
                                           IsHitTestVisible="False"
                                           Visibility="Collapsed"/>
diff --git a/src/AdonisUI.ClassicTheme/DefaultStyles/TextBox.xaml b/src/AdonisUI.ClassicTheme/DefaultStyles/TextBox.xaml
index 7577c7f..dab8f9d 100644
--- a/src/AdonisUI.ClassicTheme/DefaultStyles/TextBox.xaml
+++ b/src/AdonisUI.ClassicTheme/DefaultStyles/TextBox.xaml
@@ -129,8 +129,8 @@
                             <Grid>
                                 <ContentPresenter x:Name="PlaceholderHost"
                                                   Content="{TemplateBinding adonisExtensions:WatermarkExtension.Watermark}"
-                                                  HorizontalAlignment="Stretch"
-                                                  VerticalAlignment="Stretch"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                                   Opacity="0.5"
                                                   IsHitTestVisible="False"
                                                   Visibility="Collapsed"/>