Merge pull request #9470 from mono/fix-1027840

Fix dialog parenting issue
mono · Dec 13, 2019 · 5ceba5a · 5ceba5a
2 parents 1da95c7 + ec9cad7
commit 5ceba5a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/main/src/addins/MacPlatform/MacPlatform.cs b/main/src/addins/MacPlatform/MacPlatform.cs
@@ -1136,7 +1136,8 @@ public override Window GetParentForModalWindow ()
 		bool HasAnyDockWindowFocused ()
 		{
 			foreach (var window in Gtk.Window.ListToplevels ()) {
-				if (!window.HasToplevelFocus) {
+				// Gtk.Window.HasToplevelFocus may return false for a window that embeds a Cocoa view
+				if (!window.HasToplevelFocus && GtkQuartz.GetWindow (window) != NSApplication.SharedApplication.KeyWindow) {
 					continue;
 				}
 				if (window is Components.Docking.DockFloatingWindow floatingWindow) {