diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2019-12-13 18:31:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-13 18:31:54 +0300 |
| commit | 24c08c64ebf6d81a0d5a08343a413f2651bd8e2e (patch) | |
| tree | 0e85ce1cf7a09c34b248306ebc0e8a87cc0d1f57 | |
| parent | f343504fe721e79af03ae6b76f566fa15218ea2c (diff) | |
| parent | a7ec3feeb52cad3c65e8ee48df4c43ce201a71fd (diff) | |
Merge pull request #9471 from mono/backport-pr-9470-to-release-8.4
[release-8.4] 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 edfec54a46..e5bb3c6d74 100644 --- a/main/src/addins/MacPlatform/MacPlatform.cs +++ b/main/src/addins/MacPlatform/MacPlatform.cs @@ -1132,7 +1132,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) { |