diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2020-08-19 12:39:35 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-19 12:39:35 -0300 |
| commit | 844251596fb6ceaaeef521611ea32e138b1adc3b (patch) | |
| tree | 04f1ff377da6fddd04ee741b6ae50d649b8a39c9 /platform/osx/display_server_osx.mm | |
| parent | d3bd84d705b014025042e57d1c3f802dc4d66595 (diff) | |
| parent | 9c5c1635b24f6eabdb4a061419b0ff3c52d327fe (diff) | |
Merge pull request #41373 from godotengine/revert-38727-tiling-wm-issues-tests
Revert "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, 3 insertions, 8 deletions
diff --git a/platform/osx/display_server_osx.mm b/platform/osx/display_server_osx.mm index c4a5849d43..dfb1783a2c 100644 --- a/platform/osx/display_server_osx.mm +++ b/platform/osx/display_server_osx.mm @@ -2314,23 +2314,18 @@ 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) { @@ -3779,7 +3774,7 @@ DisplayServerOSX::DisplayServerOSX(const String &p_rendering_driver, WindowMode window_set_flag(WindowFlags(i), true, main_window); } } - show_window(MAIN_WINDOW_ID); + [windows[main_window].window_object makeKeyAndOrderFront:nil]; #if defined(OPENGL_ENABLED) if (rendering_driver == "opengl_es") { |