diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-26 17:41:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 17:41:28 +0200 |
| commit | 3842e8c465b286247eb11263dde6353bf62bf2e2 (patch) | |
| tree | ab82f081ae96fe60af4c24be42c28c223909a1e6 /platform/osx/display_server_osx.mm | |
| parent | 33d423e240fbfa0b28bfa40fd0be746e88e95a31 (diff) | |
| parent | d670a49612f76d036dd6f3b23e895a9ca7c1a9ca (diff) | |
| download | redot-engine-3842e8c465b286247eb11263dde6353bf62bf2e2.tar.gz | |
Merge pull request #38727 from Riteo/tiling-wm-issues-tests
Fixes for windows in X11 tiling WMs
Diffstat (limited to 'platform/osx/display_server_osx.mm')
| -rw-r--r-- | platform/osx/display_server_osx.mm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/platform/osx/display_server_osx.mm b/platform/osx/display_server_osx.mm index ffe60ad582..a6e117ab1d 100644 --- a/platform/osx/display_server_osx.mm +++ b/platform/osx/display_server_osx.mm @@ -2311,18 +2311,23 @@ DisplayServer::WindowID DisplayServerOSX::create_sub_window(WindowMode p_mode, u _THREAD_SAFE_METHOD_ WindowID id = _create_window(p_mode, p_rect); - WindowData &wd = windows[id]; for (int i = 0; i < WINDOW_FLAG_MAX; i++) { if (p_flags & (1 << i)) { window_set_flag(WindowFlags(i), true, id); } } + + return id; +} + +void DisplayServerOSX::show_window(WindowID p_id) { + WindowData &wd = windows[p_id]; + if (wd.no_focus) { [wd.window_object orderFront:nil]; } else { [wd.window_object makeKeyAndOrderFront:nil]; } - return id; } void DisplayServerOSX::_send_window_event(const WindowData &wd, WindowEvent p_event) { @@ -3767,7 +3772,7 @@ DisplayServerOSX::DisplayServerOSX(const String &p_rendering_driver, WindowMode window_set_flag(WindowFlags(i), true, main_window); } } - [windows[main_window].window_object makeKeyAndOrderFront:nil]; + show_window(MAIN_WINDOW_ID); #if defined(OPENGL_ENABLED) if (rendering_driver == "opengl_es") { |