diff options
| author | Vsevolod Kukol <sevoku@microsoft.com> | 2020-01-09 14:41:13 +0300 |
|---|---|---|
| committer | Vsevolod Kukol <sevoku@microsoft.com> | 2020-01-09 14:41:13 +0300 |
| commit | 866baa2a7ebd550c42e9aa4c4e4e22eaf9932ba2 (patch) | |
| tree | c47065ab969e4733d4bc2f0e410a437b44b85051 /main/src/addins/MacPlatform/MacPlatform.cs | |
| parent | e80f6be8e05ca47c4df2a47deb885af5be3df8cd (diff) | |
| parent | 4c6723413e884e024466fc93ff10e938bca7f721 (diff) | |
Merge remote-tracking branch 'origin/release-8.4' into release-8.4-a11y
Diffstat (limited to 'main/src/addins/MacPlatform/MacPlatform.cs')
| -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 e02d587dce..0824931d24 100644 --- a/main/src/addins/MacPlatform/MacPlatform.cs +++ b/main/src/addins/MacPlatform/MacPlatform.cs @@ -1140,7 +1140,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) { |