Merge pull request #9050 from vnen/fix-run-window-size

Update window size property names for editor run
This commit is contained in:
Rémi Verschelde 2017-06-05 08:52:58 +02:00 committed by GitHub
commit f09f1456b3

View File

@ -78,12 +78,12 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li
Size2 desired_size;
desired_size.x = GlobalConfig::get_singleton()->get("display/width");
desired_size.y = GlobalConfig::get_singleton()->get("display/height");
desired_size.x = GlobalConfig::get_singleton()->get("display/window/width");
desired_size.y = GlobalConfig::get_singleton()->get("display/window/height");
Size2 test_size;
test_size.x = GlobalConfig::get_singleton()->get("display/test_width");
test_size.y = GlobalConfig::get_singleton()->get("display/test_height");
test_size.x = GlobalConfig::get_singleton()->get("display/window/test_width");
test_size.y = GlobalConfig::get_singleton()->get("display/window/test_height");
if (test_size.x > 0 && test_size.y > 0) {
desired_size = test_size;