diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-03 15:56:05 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-03 15:56:05 +0100 |
| commit | 8791e333da786fbb3645ca999810bbeab37674bb (patch) | |
| tree | a2cd5a19789cd54b64ee1bef0a0a1e1ecff294ab /scene/main | |
| parent | f0893890e1f4b00c1beb792908b18bf602d686b0 (diff) | |
| parent | f7955633de42d660a24efafdf32b3bd3b72f6251 (diff) | |
Merge pull request #70624 from bruvzg/cur_sc
Improve `window_set_current_screen` and fix secondary window initial mode and positions.
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/window.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scene/main/window.cpp b/scene/main/window.cpp index c71c3e195b..f18b712153 100644 --- a/scene/main/window.cpp +++ b/scene/main/window.cpp @@ -462,9 +462,8 @@ void Window::_make_window() { } DisplayServer::VSyncMode vsync_mode = DisplayServer::get_singleton()->window_get_vsync_mode(DisplayServer::MAIN_WINDOW_ID); - window_id = DisplayServer::get_singleton()->create_sub_window(DisplayServer::WindowMode(mode), vsync_mode, f, Rect2i(position, size)); + window_id = DisplayServer::get_singleton()->create_sub_window(DisplayServer::WindowMode(mode), vsync_mode, f, Rect2i(position, size), current_screen); ERR_FAIL_COND(window_id == DisplayServer::INVALID_WINDOW_ID); - DisplayServer::get_singleton()->window_set_current_screen(current_screen, window_id); DisplayServer::get_singleton()->window_set_max_size(Size2i(), window_id); DisplayServer::get_singleton()->window_set_min_size(Size2i(), window_id); String tr_title = atr(title); |