Merge pull request #2687 from cwensley/curtis/wpf-avoid-showing-windo…

…w-before-loaded Form visibility fixes
picoe · Oct 1, 2024 · 156c07e · 156c07e
2 parents d368424 + d2048e4
commit 156c07e
Show file tree

Hide file tree

Showing 14 changed files with 975 additions and 823 deletions.
diff --git a/src/Eto.Gtk/Forms/FormHandler.cs b/src/Eto.Gtk/Forms/FormHandler.cs
@@ -1,3 +1,5 @@
+using Eto.GtkSharp.CustomControls;
+
 namespace Eto.GtkSharp.Forms
 {
 	public class FormHandler : GtkWindow<Gtk.Window, Form, Form.ICallback>, Form.IHandler
@@ -55,5 +57,18 @@ public bool CanFocus
 			get { return Widget.Properties.Get<bool>(CanFocus_Key, true); }
 			set { Widget.Properties.Set(CanFocus_Key, value, () => Control.AcceptFocus = value, true); }
 		}
+
+		public override bool Visible
+		{
+			get => base.Visible;
+			set
+			{
+				base.Visible = value;
+				if (ShowActivated && value)
+				{
+					Focus();
+				}
+			}
+		}
 	}
 }
diff --git a/src/Eto.Gtk/Forms/GtkWindow.cs b/src/Eto.Gtk/Forms/GtkWindow.cs
@@ -801,7 +801,7 @@ public Screen Screen
 			}
 		}
 
-		protected override void GrabFocus() => Control.Present();
+		protected override void GrabFocus() => Control.GetWindow().Focus(0);
 
 		public void BringToFront()
 		{