diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-29 09:04:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-29 09:04:53 +0200 |
| commit | 7e1e0f496bbc92f85061182c6c201d41c4cc52ac (patch) | |
| tree | ebddc58391c4e68633f6999f162c4716cb6f88d6 /platform | |
| parent | e23bd5a1cb0f17ca6085359a4e87d58d80bcceaa (diff) | |
| parent | 63a00aec68fe875efd875265e30c3ed1c475a95f (diff) | |
Merge pull request #37802 from ThakeeNathees/window-position-bug-osx-x11
display server window position bug fix
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/linuxbsd/display_server_x11.cpp | 6 | ||||
| -rw-r--r-- | platform/osx/display_server_osx.mm | 5 | ||||
| -rw-r--r-- | platform/windows/display_server_windows.cpp | 5 |
3 files changed, 12 insertions, 4 deletions
diff --git a/platform/linuxbsd/display_server_x11.cpp b/platform/linuxbsd/display_server_x11.cpp index 22790a3fe5..e38b0c13d0 100644 --- a/platform/linuxbsd/display_server_x11.cpp +++ b/platform/linuxbsd/display_server_x11.cpp @@ -3606,8 +3606,10 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode } } #endif - - WindowID main_window = _create_window(p_mode, p_flags, Rect2i(Point2(), p_resolution)); + Point2i window_position( + (screen_get_size(0).width - p_resolution.width) / 2, + (screen_get_size(0).height - p_resolution.height) / 2); + WindowID main_window = _create_window(p_mode, p_flags, Rect2i(window_position, p_resolution)); for (int i = 0; i < WINDOW_FLAG_MAX; i++) { if (p_flags & (1 << i)) { window_set_flag(WindowFlags(i), true, main_window); diff --git a/platform/osx/display_server_osx.mm b/platform/osx/display_server_osx.mm index a44bfef94c..9d92992332 100644 --- a/platform/osx/display_server_osx.mm +++ b/platform/osx/display_server_osx.mm @@ -3528,7 +3528,10 @@ DisplayServerOSX::DisplayServerOSX(const String &p_rendering_driver, WindowMode } #endif - WindowID main_window = _create_window(p_mode, Rect2i(Point2i(), p_resolution)); + Point2i window_position( + (screen_get_size(0).width - p_resolution.width) / 2, + (screen_get_size(0).height - p_resolution.height) / 2); + WindowID main_window = _create_window(p_mode, Rect2i(window_position, p_resolution)); for (int i = 0; i < WINDOW_FLAG_MAX; i++) { if (p_flags & (1 << i)) { window_set_flag(WindowFlags(i), true, main_window); diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index 4d4273a073..e4fe7f04d0 100644 --- a/platform/windows/display_server_windows.cpp +++ b/platform/windows/display_server_windows.cpp @@ -2897,7 +2897,10 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win } } #endif - WindowID main_window = _create_window(p_mode, 0, Rect2i(Point2i(), p_resolution)); + Point2i window_position( + (screen_get_size(0).width - p_resolution.width) / 2, + (screen_get_size(0).height - p_resolution.height) / 2); + WindowID main_window = _create_window(p_mode, 0, Rect2i(window_position, p_resolution)); for (int i = 0; i < WINDOW_FLAG_MAX; i++) { if (p_flags & (1 << i)) { window_set_flag(WindowFlags(i), true, main_window); |