Merge pull request #2512 from cwensley/curtis/mac-gtk-got-lost-focus-…

…along-with-window-focus Mac/Gtk: Ensure control gets Got/LostFocus events when window Got/LostFocus is triggered
picoe · Jul 4, 2023 · be8742e · be8742e
2 parents 9931162 + f79994f
commit be8742e
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 3 deletions.
diff --git a/src/Eto.Gtk/Forms/GtkControl.cs b/src/Eto.Gtk/Forms/GtkControl.cs
@@ -293,7 +293,7 @@ void Widget_SetFocus(object sender, EventArgs e)
 			Eto.Forms.Application.Instance.AsyncInvoke(GrabFocus);
 		}
 
-		public bool HasFocus
+		public virtual bool HasFocus
 		{
 			get { return Control.HasFocus; }
 		}
@@ -691,7 +691,7 @@ public virtual void FocusInEvent(object o, Gtk.FocusInEventArgs args)
 				var handler = Handler;
 				if (handler == null)
 					return;
-				handler.Callback.OnGotFocus(handler.Widget, EventArgs.Empty);
+				Application.Instance.AsyncInvoke(() => handler.Callback.OnGotFocus(handler.Widget, EventArgs.Empty));
 			}
 
 			public virtual void FocusOutEvent(object o, Gtk.FocusOutEventArgs args)

diff --git a/src/Eto.Gtk/Forms/GtkWindow.cs b/src/Eto.Gtk/Forms/GtkWindow.cs
@@ -128,6 +128,8 @@ public override Size MinimumSize
 			}
 		}
 
+		public override bool HasFocus => Control.HasToplevelFocus;
+
 		public Gtk.Widget WindowContentControl
 		{
 			get { return vbox; }

diff --git a/src/Eto.Mac/Forms/MacView.cs b/src/Eto.Mac/Forms/MacView.cs
@@ -1062,7 +1062,7 @@ public virtual bool HasFocus
 		{
 			get
 			{
-				return ShouldHaveFocus ?? (FocusControl.Window != null && FocusControl.Window.FirstResponder == Control);
+				return ShouldHaveFocus ?? (FocusControl.Window?.FirstResponder == Control && FocusControl.Window?.IsKeyWindow == true);
 			}
 		}
 

diff --git a/src/Eto.Mac/Forms/MacWindow.cs b/src/Eto.Mac/Forms/MacWindow.cs
@@ -339,13 +339,23 @@ static void HandleGotFocus(object sender, EventArgs e)
 			if (handler == null)
 				return;
 			handler.Callback.OnGotFocus(handler.Widget, EventArgs.Empty);
+			if (GetHandler(handler.Control.FirstResponder) is IMacViewHandler ctlHandler)
+			{
+				ctlHandler.Callback.OnGotFocus(ctlHandler.Widget, EventArgs.Empty);
+			}
 		}
 
 		static void HandleLostFocus(object sender, EventArgs e)
 		{
 			var handler = GetHandler(sender) as MacWindow<TControl, TWidget, TCallback>;
 			if (handler == null)
 				return;
+
+			if (GetHandler(handler.Control.FirstResponder) is IMacViewHandler ctlHandler)
+			{
+				ctlHandler.Callback.OnLostFocus(ctlHandler.Widget, EventArgs.Empty);
+			}
+
 			handler.Callback.OnLostFocus(handler.Widget, EventArgs.Empty);
 		}
 
@@ -1043,6 +1053,14 @@ public bool AnimateSizeChanges
 			set => Widget.Properties.Set(MacWindow.AnimateSizeChanges_Key, value);
 		}
 
+		protected override void Initialize()
+		{
+			base.Initialize();
+
+			// need to send Got/LostFocus to child when window Got/LostFocus is called
+			HandleEvent(Window.LostFocusEvent);
+			HandleEvent(Window.GotFocusEvent);
+		}
 
 		public override void OnLoad(EventArgs e)
 		{

diff --git a/test/Eto.Test/Sections/Behaviors/FocusEventsSection.cs b/test/Eto.Test/Sections/Behaviors/FocusEventsSection.cs
@@ -3,6 +3,32 @@ namespace Eto.Test.Sections.Behaviors
 	[Section("Behaviors", "Focus Events")]
 	public class FocusEventsSection : AllControlsBase
 	{
+		protected override void OnLoad(EventArgs e)
+		{
+			base.OnLoad(e);
+			ParentWindow.GotFocus += Window_GotFocus;
+			ParentWindow.LostFocus += Window_LostFocus;
+		}
+
+		protected override void OnUnLoad(EventArgs e)
+		{
+			base.OnUnLoad(e);
+			ParentWindow.GotFocus -= Window_GotFocus;
+			ParentWindow.LostFocus -= Window_LostFocus;
+		}
+
+		protected void Window_GotFocus(object sender, EventArgs e)
+		{
+			if (sender is Window window)
+				Log.Write(sender, $"Window.GotFocus, HasFocus: {window.HasFocus}");
+		}
+
+		protected void Window_LostFocus(object sender, EventArgs e)
+		{
+			if (sender is Window window)
+				Log.Write(sender, $"Window.LostFocus, HasFocus: {window.HasFocus}");
+		}
+
 		protected override void LogEvents(Control control)
 		{
 			base.LogEvents(control);