Merge pull request #2690 from cwensley/curtis/wpf-hide-child-windows-…

…without-hiding-parents

Wpf: Clear owner before setting Visible to false

src/Eto.Wpf/Forms/WpfWindow.cs

@@ -1079,18 +1079,21 @@ public void SetOwner(Window owner)
 		{
 			if (owner == null)
 			{
+				// Clear out WPF owner
 				Control.Owner = null;
-				return;
+
+				// If the owner was set to an HWND clear that out too.
+				var interop = windowInterop ?? new sw.Interop.WindowInteropHelper(Control);
+				interop.Owner = IntPtr.Zero;
 			}
-			var wpfWindow = owner.Handler as IWpfWindow;
-			if (wpfWindow != null)
+			else if (owner.Handler is IWpfWindow wpfWindow)
+			{
+				// Owner could be an HwndWindowHandler (or other) which sets owner differently
 				wpfWindow.SetOwnerFor(Control);
+			}
 		}
 
-		public double WpfScale
-		{
-			get { return dpiHelper?.WpfScale ?? 1f; }
-		}
+		public double WpfScale => dpiHelper?.WpfScale ?? 1f;
 
 		public float LogicalPixelSize
 		{
@@ -1119,10 +1122,18 @@ public override bool Visible
 			set
 			{
 				if (value)
+				{
+					// set owner back if we weren't visible beforehand
+					SetOwner(Widget.Owner);
 					Control.Show();
+				}
 				else
+				{
+					// hiding will hide entire owner chain, so clear that out before making it invisible.
+					SetOwner(null);
 					Control.Hide();
 			}
 		}
 	}
 }
+}