Mac: Prevent GotFocus/LostFocus firing twice when the form is the Fir…

…stReponder
picoe · Apr 24, 2024 · c312ea1 · c312ea1
1 parent d2010b2
commit c312ea1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Eto.Mac/Forms/MacWindow.cs b/src/Eto.Mac/Forms/MacWindow.cs
@@ -342,7 +342,7 @@ 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)
+			if (GetHandler(handler.Control.FirstResponder) is IMacViewHandler ctlHandler && ctlHandler != handler)
 			{
 				ctlHandler.Callback.OnGotFocus(ctlHandler.Widget, EventArgs.Empty);
 			}
@@ -354,7 +354,7 @@ static void HandleLostFocus(object sender, EventArgs e)
 			if (handler == null)
 				return;
 
-			if (GetHandler(handler.Control.FirstResponder) is IMacViewHandler ctlHandler)
+			if (GetHandler(handler.Control.FirstResponder) is IMacViewHandler ctlHandler && ctlHandler != handler)
 			{
 				ctlHandler.Callback.OnLostFocus(ctlHandler.Widget, EventArgs.Empty);
 			}