rename IsDescendant() to IsAncestorOf(), rename HasAncestor() to IsDescendantOf(), new implementaiton of IsDescendantOf()

Author: jonfunkhouser

MaterialDesignThemes.Wpf/ComboBoxPopup.cs

@@ -106,7 +106,7 @@ private CustomPopupPlacement[] ComboBoxCustomPopupPlacementCallback(Size popupSi
         {
             var locationFromScreen = this.PlacementTarget.PointToScreen(new Point(0, 0));
 
-            var mainVisual = PlacementTarget.GetVisualAncestory().OfType<System.Windows.Media.Visual>().LastOrDefault();
+            var mainVisual = PlacementTarget.GetVisualAncestry().OfType<System.Windows.Media.Visual>().LastOrDefault();
             if (mainVisual == null) return new CustomPopupPlacement[0];
 
             var screenWidth = (int) DpiHelper.TransformToDeviceX(mainVisual, SystemParameters.PrimaryScreenWidth);

MaterialDesignThemes.Wpf/Extensions.cs

@@ -24,17 +24,17 @@ public static IEnumerable<DependencyObject> VisualDepthFirstTraversal(this Depen
             }
         }
 
-        public static bool IsDescendant(this DependencyObject parent, DependencyObject node)
+        public static bool IsAncestorOf(this DependencyObject parent, DependencyObject node)
         {
             return node != null && parent.VisualDepthFirstTraversal().Contains(node);
         }
 
         /// <summary>
-        /// Returns full visual ancestory, starting at the leaf.
+        /// Returns full visual ancestry, starting at the leaf.
         /// </summary>
         /// <param name="leaf"></param>
         /// <returns></returns>
-        public static IEnumerable<DependencyObject> GetVisualAncestory(this DependencyObject leaf)
+        public static IEnumerable<DependencyObject> GetVisualAncestry(this DependencyObject leaf)
         {
             while (leaf != null)
             {
@@ -43,7 +43,7 @@ public static IEnumerable<DependencyObject> GetVisualAncestory(this DependencyOb
             }
         }
 
-        public static IEnumerable<DependencyObject> GetLogicalAncestory(this DependencyObject leaf)
+        public static IEnumerable<DependencyObject> GetLogicalAncestry(this DependencyObject leaf)
         {
             while (leaf != null)
             {
@@ -52,17 +52,18 @@ public static IEnumerable<DependencyObject> GetLogicalAncestory(this DependencyO
             }
         }
 
-        public static bool HasAncestor(this DependencyObject leaf, DependencyObject ancestor)
+        public static bool IsDescendantOf(this DependencyObject leaf, DependencyObject ancestor)
         {
-            var visualAncestry = leaf.GetVisualAncestory().ToArray();
-            if (visualAncestry.Contains(ancestor))
+            DependencyObject parent = null;
+            foreach (var node in leaf.GetVisualAncestry())
             {
-                return true;
+                if (Equals(node, ancestor))
+                    return true;
+
+                parent = node;
             }
 
-            var lastVisualAncestor = visualAncestry.LastOrDefault();
-            var logicalAncestry = GetLogicalAncestory(lastVisualAncestor);
-            return logicalAncestry.Contains(ancestor);
+            return parent != null && parent.GetLogicalAncestry().Contains(ancestor);
         }
     }
 }

MaterialDesignThemes.Wpf/PopupBox.cs

@@ -578,14 +578,14 @@ private static void OnLostMouseCapture(object sender, MouseEventArgs e)
             {
                 if (e.OriginalSource == popupBox)
                 {
-                    if (Mouse.Captured == null || popupBox._popup == null || !(Mouse.Captured as DependencyObject).HasAncestor(popupBox._popup))
+                    if (Mouse.Captured == null || popupBox._popup == null || !(Mouse.Captured as DependencyObject).IsDescendantOf(popupBox._popup))
                     {
                         popupBox.Close();
                     }
                 }
                 else
                 {
-                    if ((Mouse.Captured as DependencyObject).GetVisualAncestory().Contains(popupBox._popup))
+                    if ((Mouse.Captured as DependencyObject).GetVisualAncestry().Contains(popupBox._popup))
                     {
                         // Take capture if one of our children gave up capture (by closing their drop down)
                         if (popupBox.IsPopupOpen && Mouse.Captured == null && GetCapture() == IntPtr.Zero)