Merge branch 'popup-button-fix' of https://github.com/jonfunkhouser/MaterialDesignInXamlToolkit into jonfunkhouser-popup-button-fix

Author: ButchersBoy

MainDemo.Wpf/MainWindow.xaml

@@ -169,6 +169,7 @@
                                 <ListBoxItem>Hello World</ListBoxItem>
                                 <ListBoxItem>Nice Popup</ListBoxItem>
                                 <ListBoxItem>Goodbye.</ListBoxItem>
+                                <ListBoxItem><Button x:Name="PopupButton" Content="Button" Click="PopupButton_OnClick"/></ListBoxItem>
                             </ListBox>
                         </materialDesign:PopupBox>
                         <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="22">Material Design In XAML Toolkit</TextBlock>

MainDemo.Wpf/MainWindow.xaml.cs

@@ -17,5 +17,10 @@ private void UIElement_OnPreviewMouseLeftButtonUp(object sender, MouseButtonEven
         {
             MenuToggleButton.IsChecked = false;
         }
+
+        private void PopupButton_OnClick(object sender, RoutedEventArgs e)
+        {
+            MessageBox.Show("PopupButton Clicked");
+        }
     } 
 }

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,23 +24,46 @@ 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)
             {
                 yield return leaf;
                 leaf = VisualTreeHelper.GetParent(leaf);
             }
-        } 
+        }
+
+        public static IEnumerable<DependencyObject> GetLogicalAncestry(this DependencyObject leaf)
+        {
+            while (leaf != null)
+            {
+                yield return leaf;
+                leaf = LogicalTreeHelper.GetParent(leaf);
+            }
+        }
+
+        public static bool IsDescendantOf(this DependencyObject leaf, DependencyObject ancestor)
+        {
+            DependencyObject parent = null;
+            foreach (var node in leaf.GetVisualAncestry())
+            {
+                if (Equals(node, ancestor))
+                    return true;
+
+                parent = node;
+            }
+
+            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).GetVisualAncestory().Contains(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)