Added ValidationAssist.HorizontalAlignment (#1767)

* Added ValidationAssist.HorizontalAlignment (#962)

* Updated Fields-Page to show ValidationAssist.HorizontalAlignment (#962)

Author: greuelpirat

MainDemo.Wpf/Fields.xaml

@@ -269,9 +269,9 @@
                     </ContentControl.ContentTemplateSelector>
                 </ContentControl>
             </smtx:XamlDisplay>
-            <TextBlock Grid.Row="0" Grid.Column="2" Style="{StaticResource MaterialDesignSubtitle1TextBlock}" Margin="32 0 0 0">Tight Space Validation</TextBlock>
+            <TextBlock Grid.Row="0" Grid.Column="2" Style="{StaticResource MaterialDesignSubtitle1TextBlock}" Margin="32 0 0 0">Validation</TextBlock>
             <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="2" Margin="32 0 0 0">
-                <smtx:XamlDisplay Key="fields_22" HorizontalAlignment="Left">
+                <smtx:XamlDisplay Key="fields_validation_1" Width="120">
                     <TextBox Width="20"
                              materialDesign:ValidationAssist.UsePopup="True"
                              HorizontalAlignment="Left"
@@ -285,11 +285,11 @@
                         </TextBox.Text>
                     </TextBox>
                 </smtx:XamlDisplay>
-                <smtx:XamlDisplay Key="fields_30" HorizontalAlignment="Left">
+                <smtx:XamlDisplay Key="fields_validation_2" Width="120">
                     <TextBox Width="20"
                              materialDesign:ValidationAssist.UsePopup="True"
                              materialDesign:ValidationAssist.PopupPlacement="Left"
-                             HorizontalAlignment="Left"
+                             HorizontalAlignment="Right"
                              ToolTip="Use a popup which can escape the bounds of the control where space is limited it can be placed in alternative positions">
                         <TextBox.Text>
                             <Binding Path="Name2" UpdateSourceTrigger="PropertyChanged">
@@ -300,6 +300,17 @@
                         </TextBox.Text>
                     </TextBox>
                 </smtx:XamlDisplay>
+                <smtx:XamlDisplay Key="fields_validation_3" Width="120">
+                    <TextBox materialDesign:ValidationAssist.HorizontalAlignment="Right">
+                        <TextBox.Text>
+                            <Binding Path="Name2" UpdateSourceTrigger="PropertyChanged">
+                                <Binding.ValidationRules>
+                                    <domain1:NotEmptyValidationRule ValidatesOnTargetUpdated="True" />
+                                </Binding.ValidationRules>
+                            </Binding>
+                        </TextBox.Text>
+                    </TextBox>
+                </smtx:XamlDisplay>
             </StackPanel>
         </Grid>
     </StackPanel>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ValidationErrorTemplate.xaml

@@ -10,7 +10,7 @@
                 <TextBlock Foreground="{DynamicResource ValidationErrorBrush}"
                            FontSize="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.FontSize)}"
                            MaxWidth="{Binding ElementName=Placeholder, Path=ActualWidth}"
-                           HorizontalAlignment="Left"
+                           HorizontalAlignment="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.HorizontalAlignment)}"
                            Margin="2"
                            TextWrapping="Wrap"
                            Text="{Binding ErrorContent}"
@@ -25,7 +25,7 @@
                 <TextBlock Foreground="{DynamicResource ValidationErrorBrush}"
                            FontSize="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.FontSize)}"
                            MaxWidth="{Binding ElementName=Placeholder, Path=ActualWidth}"
-                           HorizontalAlignment="Left"
+                           HorizontalAlignment="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.HorizontalAlignment)}"
                            Margin="0 2"
                            TextWrapping="Wrap"
                            Text="{Binding CurrentItem.ErrorContent}"
@@ -39,7 +39,7 @@
                 <Border x:Name="PopupBorder" Background="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.Background)}">
                     <TextBlock Foreground="{DynamicResource ValidationErrorBrush}"
                                FontSize="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.FontSize)}"
-                               HorizontalAlignment="Left"
+                               HorizontalAlignment="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.HorizontalAlignment)}"
                                Margin="0 2"
                                TextWrapping="Wrap"
                                Text="{Binding CurrentItem.ErrorContent}"

MaterialDesignThemes.Wpf/ValidationAssist.cs

@@ -1,6 +1,5 @@
 using System.Windows;
 using System.Windows.Controls.Primitives;
-using System.Windows.Documents;
 using System.Windows.Media;
 
 namespace MaterialDesignThemes.Wpf
@@ -138,5 +137,11 @@ public static bool GetHasError(DependencyObject element)
         {
             return (bool)element.GetValue(HasErrorProperty);
         }
+
+        public static readonly DependencyProperty HorizontalAlignmentProperty = DependencyProperty.RegisterAttached(
+            "HorizontalAlignment", typeof(HorizontalAlignment), typeof(ValidationAssist), new PropertyMetadata(HorizontalAlignment.Left));
+
+        public static void SetHorizontalAlignment(DependencyObject element, HorizontalAlignment value) => element.SetValue(HorizontalAlignmentProperty, value);
+        public static HorizontalAlignment GetHorizontalAlignment(DependencyObject element) => (HorizontalAlignment) element.GetValue(HorizontalAlignmentProperty);
     }
 }