Merge branch 'hotfix/2.4.6' into main

punker76 · punker76 · commit 44213224cb49 · 2021-06-10T16:39:31.000+02:00
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
@@ -144,7 +144,7 @@ private void CustomValidationPopup_Loaded(object sender, RoutedEventArgs e)
                 this.scrollViewer.ScrollChanged -= this.ScrollViewer_ScrollChanged;
             }
 
-            this.scrollViewer = adornedElement.TryFindParent<ScrollViewer>();
+            this.scrollViewer = adornedElement.GetVisualAncestor<ScrollViewer>();
             if (this.scrollViewer != null)
             {
                 this.scrollViewer.ScrollChanged += this.ScrollViewer_ScrollChanged;
@@ -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;
diff --git a/src/MahApps.Metro/Controls/TreeHelper.cs b/src/MahApps.Metro/Controls/TreeHelper.cs
@@ -58,6 +58,47 @@ public static IEnumerable<DependencyObject> GetAncestors(this DependencyObject c
             }
         }
 
+        /// <summary>
+        /// Returns full visual ancestry, starting at the leaf.
+        /// <para>If element is not of <see cref="Visual"/> or <see cref="Visual3D"/> the logical ancestry is used.</para>
+        /// </summary>
+        /// <param name="leaf">The starting object.</param>
+        /// <returns></returns>
+        public static IEnumerable<DependencyObject> GetVisualAncestry(this DependencyObject? leaf)
+        {
+            while (leaf != null)
+            {
+                yield return leaf;
+                leaf = leaf is Visual || leaf is Visual3D
+                    ? VisualTreeHelper.GetParent(leaf)
+                    : LogicalTreeHelper.GetParent(leaf);
+            }
+        }
+
+        /// <summary>
+        /// Tries to find and returns a visual ancestor, starting at the leaf.
+        /// <para>If element is not of <see cref="Visual"/> or <see cref="Visual3D"/> the logical ancestry is used.</para>
+        /// </summary>
+        /// <param name="leaf">The starting object.</param>
+        /// <returns></returns>
+        public static T GetVisualAncestor<T>(this DependencyObject? leaf)
+            where T : DependencyObject
+        {
+            while (leaf != null)
+            {
+                if (leaf is T ancestor)
+                {
+                    return ancestor;
+                }
+
+                leaf = leaf is Visual || leaf is Visual3D
+                    ? VisualTreeHelper.GetParent(leaf)
+                    : LogicalTreeHelper.GetParent(leaf);
+            }
+
+            return default(T);
+        }
+
         /// <summary>
         /// Finds a Child of a given item in the visual tree. 
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ private void CustomValidationPopup_Loaded(object sender, RoutedEventArgs e)`
`144`	`144`	`this.scrollViewer.ScrollChanged -= this.ScrollViewer_ScrollChanged;`
`145`	`145`	`}`
`146`	`146`
`147`		`- this.scrollViewer = adornedElement.TryFindParent<ScrollViewer>();`
	`147`	`+ this.scrollViewer = adornedElement.GetVisualAncestor<ScrollViewer>();`
`148`	`148`	`if (this.scrollViewer != null)`
`149`	`149`	`{`
`150`	`150`	`this.scrollViewer.ScrollChanged += this.ScrollViewer_ScrollChanged;`
`@@ -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;`