summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-06-05 08:52:58 +0200
committerGitHub <noreply@github.com>2017-06-05 08:52:58 +0200
commitf09f1456b33430e86c409fe02470d9c2895e7c75 (patch)
tree7e71bb0de65fac72249be7477c094a9f7b5a22cb
parent40959acef2b16a7f9658c780943cccfadb8ef78c (diff)
parent18d7ab21df3fed45c4fa149ed9f22d43bbfafdd6 (diff)
Merge pull request #9050 from vnen/fix-run-window-size
Update window size property names for editor run
-rw-r--r--editor/editor_run.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp
index e0ebe985cd..d2f841c3ee 100644
--- a/editor/editor_run.cpp
+++ b/editor/editor_run.cpp
@@ -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;