Merge pull request #542 from stealthcold/popupbox-fix

ButchersBoy · web-flow · commit ec69ebc36271 · 2016-11-08T05:04:39.000-08:00
Popup fix when selecting value from datepicker inside a popup
diff --git a/MaterialDesignThemes.Wpf/PopupBox.cs b/MaterialDesignThemes.Wpf/PopupBox.cs
@@ -644,9 +644,12 @@ private static void OnLostMouseCapture(object sender, MouseEventArgs e)
 
             if (Equals(e.OriginalSource, popupBox))
             {
-                if (Mouse.Captured == null || popupBox._popup == null || !(Mouse.Captured as DependencyObject).IsDescendantOf(popupBox._popup))
+                if (Mouse.Captured == null || popupBox._popup == null)
                 {
-                    popupBox.Close();
+                    if (!(Mouse.Captured as DependencyObject).IsDescendantOf(popupBox._popup))
+                    {
+                        popupBox.Close();
+                    }
                 }
             }
             else

Original file line number	Diff line number	Diff line change
`@@ -644,9 +644,12 @@ private static void OnLostMouseCapture(object sender, MouseEventArgs e)`
`644`	`644`
`645`	`645`	`if (Equals(e.OriginalSource, popupBox))`
`646`	`646`	`{`
`647`		`- if (Mouse.Captured == null \|\| popupBox._popup == null \|\| !(Mouse.Captured as DependencyObject).IsDescendantOf(popupBox._popup))`
	`647`	`+ if (Mouse.Captured == null \|\| popupBox._popup == null)`
`648`	`648`	`{`
`649`		`- popupBox.Close();`
	`649`	`+ if (!(Mouse.Captured as DependencyObject).IsDescendantOf(popupBox._popup))`
	`650`	`+ {`
	`651`	`+ popupBox.Close();`
	`652`	`+ }`
`650`	`653`	`}`
`651`	`654`	`}`
`652`	`655`	`else`