diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-26 15:02:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 15:02:44 +0200 |
| commit | cab0f12aee0e3c9c73d7773cc650bde0ff92ed3a (patch) | |
| tree | cbbb68572e971732e92bba7e57366452923595fb | |
| parent | 5700429e4edca4ba90a406976ac3e8b337a50eb8 (diff) | |
| parent | 4c0081105fc24f827739d45795af41dfa2e950aa (diff) | |
Merge pull request #40721 from bruvzg/macos_tooltip_nofocus
[macOS] Fix tooltips stealing focus.
| -rw-r--r-- | platform/osx/display_server_osx.mm | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/platform/osx/display_server_osx.mm b/platform/osx/display_server_osx.mm index 5e209a6e6b..ffe60ad582 100644 --- a/platform/osx/display_server_osx.mm +++ b/platform/osx/display_server_osx.mm @@ -2793,7 +2793,9 @@ void DisplayServerOSX::window_set_flag(WindowFlags p_flag, bool p_enabled, Windo } break; case WINDOW_FLAG_BORDERLESS: { // OrderOut prevents a lose focus bug with the window - [wd.window_object orderOut:nil]; + if ([wd.window_object isVisible]) { + [wd.window_object orderOut:nil]; + } wd.borderless = p_enabled; if (p_enabled) { [wd.window_object setStyleMask:NSWindowStyleMaskBorderless]; @@ -2807,7 +2809,13 @@ void DisplayServerOSX::window_set_flag(WindowFlags p_flag, bool p_enabled, Windo [wd.window_object setFrame:frameRect display:NO]; } _update_window(wd); - [wd.window_object makeKeyAndOrderFront:nil]; + if ([wd.window_object isVisible]) { + if (wd.no_focus) { + [wd.window_object orderFront:nil]; + } else { + [wd.window_object makeKeyAndOrderFront:nil]; + } + } } break; case WINDOW_FLAG_ALWAYS_ON_TOP: { wd.on_top = p_enabled; @@ -2875,7 +2883,11 @@ void DisplayServerOSX::window_move_to_foreground(WindowID p_window) { const WindowData &wd = windows[p_window]; [[NSApplication sharedApplication] activateIgnoringOtherApps:YES]; - [wd.window_object makeKeyAndOrderFront:nil]; + if (wd.no_focus) { + [wd.window_object orderFront:nil]; + } else { + [wd.window_object makeKeyAndOrderFront:nil]; + } } bool DisplayServerOSX::window_can_draw(WindowID p_window) const { |