Merge pull request #4122 from MahApps/fix/4120

punker76 · punker76 · commit 8c992b2bcfd9 · 2021-06-10T16:38:23.000+02:00
Fix position of ValidationErrorTemplate together with ValidatesOnExceptions
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
@@ -159,7 +159,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)
             {
+                this.RefreshPosition();
+
                 if (IsElementVisible(this.AdornedElement as FrameworkElement, this.scrollViewer))
                 {
                     var adornedElement = this.AdornedElement;

Original file line number	Diff line number	Diff line change
`@@ -260,10 +260,10 @@ private void OnTransitionCompleted(object sender, RoutedEventArgs e)`
`260`	`260`
`261`	`261`	`private void ScrollViewer_ScrollChanged(object sender, ScrollChangedEventArgs e)`
`262`	`262`	`{`
`263`		`- this.RefreshPosition();`
`264`		`-`
`265`	`263`	`if (e.VerticalChange > 0 \|\| e.VerticalChange < 0 \|\| e.HorizontalChange > 0 \|\| e.HorizontalChange < 0)`
`266`	`264`	`{`
	`265`	`+ this.RefreshPosition();`
	`266`	`+`
`267`	`267`	`if (IsElementVisible(this.AdornedElement as FrameworkElement, this.scrollViewer))`
`268`	`268`	`{`
`269`	`269`	`var adornedElement = this.AdornedElement;`