diff options
| author | Juan Linietsky <juan@godotengine.org> | 2020-03-03 10:36:29 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2020-03-26 15:49:34 +0100 |
| commit | f8a79a97c7d12da43b111a756f09ee7ad5ea28e9 (patch) | |
| tree | 6728478a8e3bb2669ee4096cf354e87475b4469d /scene/main/scene_tree.cpp | |
| parent | 4396e98834f159da59ec790f2ff64fb65dacd9ce (diff) | |
| download | redot-engine-f8a79a97c7d12da43b111a756f09ee7ad5ea28e9.tar.gz | |
Effective DisplayServer separation, rename X11 -> LinuxBSD
Diffstat (limited to 'scene/main/scene_tree.cpp')
| -rw-r--r-- | scene/main/scene_tree.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index b7b2f190b3..b0708b70b8 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -47,6 +47,7 @@ #include "scene/resources/mesh.h" #include "scene/resources/packed_scene.h" #include "scene/scene_string_names.h" +#include "servers/display_server.h" #include "servers/navigation_server.h" #include "servers/physics_2d_server.h" #include "servers/physics_server.h" @@ -526,7 +527,7 @@ bool SceneTree::idle(float p_time) { _notify_group_pause("idle_process_internal", Node::NOTIFICATION_INTERNAL_PROCESS); _notify_group_pause("idle_process", Node::NOTIFICATION_PROCESS); - Size2 win_size = Size2(OS::get_singleton()->get_window_size().width, OS::get_singleton()->get_window_size().height); + Size2 win_size = Size2(DisplayServer::get_singleton()->window_get_size().width, DisplayServer::get_singleton()->window_get_size().height); if (win_size != last_screen_size) { @@ -1143,7 +1144,7 @@ void SceneTree::_update_root_rect() { } //actual screen video mode - Size2 video_mode = Size2(OS::get_singleton()->get_window_size().width, OS::get_singleton()->get_window_size().height); + Size2 video_mode = Size2(DisplayServer::get_singleton()->window_get_size().width, DisplayServer::get_singleton()->window_get_size().height); Size2 desired_res = stretch_min; Size2 viewport_size; @@ -1734,7 +1735,7 @@ SceneTree::SceneTree() { stretch_aspect = STRETCH_ASPECT_IGNORE; stretch_shrink = 1; - last_screen_size = Size2(OS::get_singleton()->get_window_size().width, OS::get_singleton()->get_window_size().height); + last_screen_size = Size2(DisplayServer::get_singleton()->window_get_size().width, DisplayServer::get_singleton()->window_get_size().height); _update_root_rect(); root->set_physics_object_picking(GLOBAL_DEF("physics/common/enable_object_picking", true)); |