diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2019-12-13 18:31:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-13 18:31:45 +0300 |
| commit | 5ceba5af2df85fc98c7e62cd16c88950dffc573f (patch) | |
| tree | 5633e48e6aef2b414b75e193b2b0853803b3be7b | |
| parent | 1da95c782e6cdac6ffc3784d28f1c8cdbe7b0fbe (diff) | |
| parent | ec9cad769c478c8b45344d28ddc511aee53f9b30 (diff) | |
Merge pull request #9470 from mono/fix-1027840
Fix dialog parenting issue
| -rw-r--r-- | main/src/addins/MacPlatform/MacPlatform.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/src/addins/MacPlatform/MacPlatform.cs b/main/src/addins/MacPlatform/MacPlatform.cs index a7047b4c4a..656634f242 100644 --- a/main/src/addins/MacPlatform/MacPlatform.cs +++ b/main/src/addins/MacPlatform/MacPlatform.cs @@ -1136,7 +1136,8 @@ namespace MonoDevelop.MacIntegration 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) { |