Mac: Fix reparenting a Form after hiding then setting back to visible

picoe · Sep 15, 2023 · 41079e1 · 41079e1
1 parent a225a41
commit 41079e1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Eto.Mac/Forms/FormHandler.cs b/src/Eto.Mac/Forms/FormHandler.cs
@@ -92,10 +92,15 @@ public override bool Visible
 					{
 						Control.OrderFront(ApplicationHandler.Instance.AppDelegate);
 						FireOnShown();
+						EnsureOwner();
 					}
 				}
 				else
+				{
 					base.Visible = value;
+					if (value)
+						EnsureOwner();
+				}
 			}
 		}
 

diff --git a/src/Eto.Mac/Forms/MacWindow.cs b/src/Eto.Mac/Forms/MacWindow.cs
@@ -1286,6 +1286,10 @@ bool InternalSetOwner(Window owner)
 			bool result = false;
 			if (SetAsChildWindow && Widget.Loaded)
 			{
+				// ensure we don't double subscribe to this event
+				// since this can get called multiple times
+				Widget.GotFocus -= HandleGotFocusAsChild;
+
 				if (owner != null)
 				{
 					var macWindow = owner.Handler as IMacWindow;
@@ -1299,7 +1303,6 @@ bool InternalSetOwner(Window owner)
 				}
 				else
 				{
-					Widget.GotFocus -= HandleGotFocusAsChild;
 					var parentWindow = Control.ParentWindow;
 					if (parentWindow != null)
 						parentWindow.RemoveChildWindow(Control);