summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-12-17 20:10:29 +0100
committerGitHub <noreply@github.com>2021-12-17 20:10:29 +0100
commitb0e93711b36bae3d2bb3a7e9a4a88faf055499fb (patch)
tree36e39170ee43ba53735cd4b5d670a8fccdfe6a60 /main
parent33bc761c7397b21c30a49d3f6a40b505bc6353aa (diff)
parentc7a03412acd3338663281268ac38217e92df6a65 (diff)
Merge pull request #52170 from Ansraer/2d-scale-factor
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 21e5935adc..805c8c2c84 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -2321,6 +2321,7 @@ bool Main::start() {
String stretch_aspect = GLOBAL_DEF_BASIC("display/window/stretch/aspect", "keep");
Size2i stretch_size = Size2i(GLOBAL_DEF_BASIC("display/window/size/width", 0),
GLOBAL_DEF_BASIC("display/window/size/height", 0));
+ real_t stretch_scale = GLOBAL_DEF_BASIC("display/window/stretch/scale", 1.0);
Window::ContentScaleMode cs_sm = Window::CONTENT_SCALE_MODE_DISABLED;
if (stretch_mode == "canvas_items") {
@@ -2343,6 +2344,7 @@ bool Main::start() {
sml->get_root()->set_content_scale_mode(cs_sm);
sml->get_root()->set_content_scale_aspect(cs_aspect);
sml->get_root()->set_content_scale_size(stretch_size);
+ sml->get_root()->set_content_scale_factor(stretch_scale);
sml->set_auto_accept_quit(GLOBAL_DEF("application/config/auto_accept_quit", true));
sml->set_quit_on_go_back(GLOBAL_DEF("application/config/quit_on_go_back", true));