Merge pull request #4122 from MahApps/fix/4120

Fix position of ValidationErrorTemplate together with ValidatesOnExceptions
MahApps · Jun 10, 2021 · 5c5fd39 · 5c5fd39
2 parents 8079284 + 5bb6841
commit 5c5fd39
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
@@ -161,7 +161,7 @@
                              Style="{DynamicResource MahApps.Styles.TextBox.Button}" />
                     <TextBox Margin="{StaticResource ControlMargin}"
                              mah:TextBoxHelper.Watermark="Number smaller than 10"
-                             Text="{Binding IntegerGreater10Property, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}" />
+                             Text="{Binding IntegerGreater10Property, ValidatesOnExceptions=True, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}" />
                     <TextBox Margin="{StaticResource ControlMargin}"
                              mah:TextBoxHelper.SelectAllOnFocus="True"
                              Text="Select all on focus" />

diff --git a/src/MahApps.Metro/Controls/CustomValidationPopup.cs b/src/MahApps.Metro/Controls/CustomValidationPopup.cs
@@ -260,10 +260,10 @@ private void OnTransitionCompleted(object? sender, RoutedEventArgs e)
 
         private void ScrollViewer_ScrollChanged(object? sender, ScrollChangedEventArgs e)
         {
-            this.RefreshPosition();
-
-            if (e.VerticalChange > 0 || e.VerticalChange < 0 || e.HorizontalChange > 0 || e.HorizontalChange < 0)
+            if (e.VerticalChange is > 0 or < 0 || e.HorizontalChange is > 0 or < 0)
             {
+                this.RefreshPosition();
+
                 if (IsElementVisible(this.AdornedElement as FrameworkElement, this.scrollViewer))
                 {
                     var adornedElement = this.AdornedElement;