Merge branch 'ValidationErrorTemplate' of https://github.com/l1pton17/MaterialDesignInXamlToolkit into l1pton17-ValidationErrorTemplate

Author: ButchersBoy

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ValidationErrorTemplate.xaml

@@ -3,7 +3,7 @@
                     xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf"
                     xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters">
     <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" TrueValue="Visible" FalseValue="Collapsed"/>
-    
+
     <ControlTemplate x:Key="MaterialDesignValidationErrorTemplate">
         <ControlTemplate.Resources>
             <DataTemplate DataType="{x:Type ValidationError}">
@@ -18,12 +18,10 @@
         </ControlTemplate.Resources>
         <StackPanel>
             <AdornedElementPlaceholder Name="Placeholder" />
-            <Border Name="DefaultErrorViewerWrapper"
-                        Visibility="Collapsed">
-                <Border Name="DefaultErrorViewer"
-                        Background="{DynamicResource MaterialDesignPaper}">
-                    <ContentPresenter Content="{Binding CurrentItem}" />
-                </Border>
+            <Border Name="DefaultErrorViewer"
+                    Visibility="Collapsed"
+                    Background="{DynamicResource MaterialDesignPaper}">
+                <ContentPresenter Content="{Binding CurrentItem}" />
             </Border>
 
             <wpf:CustomValidationPopup x:Name="ValidationPopup"
@@ -38,33 +36,45 @@
         <ControlTemplate.Triggers>
             <MultiDataTrigger>
                 <MultiDataTrigger.Conditions>
-                    <Condition Binding="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.ShowOnFocus)}" Value="True"/>
+                    <Condition Binding="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.OnlyShowOnFocus)}" Value="False"/>
+                    <Condition Binding="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.UsePopup)}" Value="True"/>
+                </MultiDataTrigger.Conditions>
+                <MultiDataTrigger.Setters>
+                    <Setter TargetName="ValidationPopup" Property="IsOpen" Value="True"/>
+                </MultiDataTrigger.Setters>
+            </MultiDataTrigger>
+
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.OnlyShowOnFocus)}" Value="False"/>
+                    <Condition Binding="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.UsePopup)}" Value="False"/>
+                </MultiDataTrigger.Conditions>
+                <MultiDataTrigger.Setters>
+                    <Setter TargetName="DefaultErrorViewer" Property="Visibility" Value="Visible"/>
+                </MultiDataTrigger.Setters>
+            </MultiDataTrigger>
+
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.OnlyShowOnFocus)}" Value="True"/>
                     <Condition Binding="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.UsePopup)}" Value="True"/>
                 </MultiDataTrigger.Conditions>
                 <MultiDataTrigger.Setters>
                     <Setter TargetName="ValidationPopup" Property="IsOpen"
-                        Value="{Binding ElementName=Placeholder, Path=AdornedElement.IsKeyboardFocusWithin, Mode=OneWay}"/>
+                            Value="{Binding ElementName=Placeholder, Path=AdornedElement.IsKeyboardFocusWithin, Mode=OneWay}"/>
                 </MultiDataTrigger.Setters>
             </MultiDataTrigger>
 
             <MultiDataTrigger>
                 <MultiDataTrigger.Conditions>
-                    <Condition Binding="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.ShowOnFocus)}" Value="True"/>
+                    <Condition Binding="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.OnlyShowOnFocus)}" Value="True"/>
                     <Condition Binding="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.UsePopup)}" Value="False"/>
                 </MultiDataTrigger.Conditions>
                 <MultiDataTrigger.Setters>
                     <Setter TargetName="DefaultErrorViewer" Property="Visibility"
-                        Value="{Binding ElementName=Placeholder, Path=AdornedElement.IsKeyboardFocusWithin, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                            Value="{Binding ElementName=Placeholder, Path=AdornedElement.IsKeyboardFocusWithin, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}"/>
                 </MultiDataTrigger.Setters>
             </MultiDataTrigger>
-            
-            <DataTrigger Binding="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.UsePopup)}" Value="True">
-                <Setter TargetName="ValidationPopup" Property="IsOpen" Value="True"/>
-            </DataTrigger>
-            
-            <DataTrigger Binding="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.UsePopup)}" Value="False">
-                <Setter TargetName="DefaultErrorViewerWrapper" Property="Visibility" Value="Visible"/>
-            </DataTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 </ResourceDictionary>

MaterialDesignThemes.Wpf/ValidationAssist.cs

@@ -14,20 +14,20 @@ public static class ValidationAssist
         /// <summary>
         /// The hint property
         /// </summary>
-        public static readonly DependencyProperty ShowOnFocusProperty = DependencyProperty.RegisterAttached(
-            "ShowOnFocus",
+        public static readonly DependencyProperty OnlyShowOnFocusProperty = DependencyProperty.RegisterAttached(
+            "OnlyShowOnFocus",
             typeof(bool),
             typeof(ValidationAssist),
             new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.Inherits));
 
-        public static bool GetShowOnFocus(DependencyObject element)
+        public static bool GetOnlyShowOnFocus(DependencyObject element)
         {
-            return (bool) element.GetValue(ShowOnFocusProperty);
+            return (bool)element.GetValue(OnlyShowOnFocusProperty);
         }
 
-        public static void SetShowOnFocus(DependencyObject element, bool value)
+        public static void SetOnlyShowOnFocus(DependencyObject element, bool value)
         {
-            element.SetValue(ShowOnFocusProperty, value);
+            element.SetValue(OnlyShowOnFocusProperty, value);
         }
 
         #endregion
@@ -45,12 +45,12 @@ public static void SetShowOnFocus(DependencyObject element, bool value)
 
         public static bool GetUsePopup(DependencyObject element)
         {
-            return (bool)element.GetValue(ShowOnFocusProperty);
+            return (bool)element.GetValue(OnlyShowOnFocusProperty);
         }
 
         public static void SetUsePopup(DependencyObject element, bool value)
         {
-            element.SetValue(ShowOnFocusProperty, value);
+            element.SetValue(OnlyShowOnFocusProperty, value);
         }
 
         #endregion