diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-03 07:50:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-03 07:50:50 +0200 |
| commit | eeb61ec8964f841ffa35855386dc3cbfbaea3eb0 (patch) | |
| tree | ea1c0b31f121652e39d62a655c3351f6d95e34c0 /main/main.cpp | |
| parent | d8f0375ce6f7931657f5388ddc5383a85130cfec (diff) | |
| parent | ac7e9479ce7f622af02985960b824ff0b0e7be8f (diff) | |
Merge pull request #40071 from reduz/fix-content-scale
Fix content scale mode, closes #37941
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/main.cpp b/main/main.cpp index 76175780a3..96b71c1663 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1895,10 +1895,10 @@ bool Main::start() { Size2i stretch_size = Size2(GLOBAL_DEF("display/window/size/width", 0), GLOBAL_DEF("display/window/size/height", 0)); Window::ContentScaleMode cs_sm = Window::CONTENT_SCALE_MODE_DISABLED; - if (stretch_mode == "objects") { - cs_sm = Window::CONTENT_SCALE_MODE_OBJECTS; - } else if (stretch_mode == "pixels") { - cs_sm = Window::CONTENT_SCALE_MODE_PIXELS; + if (stretch_mode == "canvas_items") { + cs_sm = Window::CONTENT_SCALE_MODE_CANVAS_ITEMS; + } else if (stretch_mode == "viewport") { + cs_sm = Window::CONTENT_SCALE_MODE_VIEWPORT; } Window::ContentScaleAspect cs_aspect = Window::CONTENT_SCALE_ASPECT_IGNORE; @@ -1954,7 +1954,7 @@ bool Main::start() { } else { GLOBAL_DEF("display/window/stretch/mode", "disabled"); - ProjectSettings::get_singleton()->set_custom_property_info("display/window/stretch/mode", PropertyInfo(Variant::STRING, "display/window/stretch/mode", PROPERTY_HINT_ENUM, "disabled,2d,viewport")); + ProjectSettings::get_singleton()->set_custom_property_info("display/window/stretch/mode", PropertyInfo(Variant::STRING, "display/window/stretch/mode", PROPERTY_HINT_ENUM, "disabled,canvas_items,viewport")); GLOBAL_DEF("display/window/stretch/aspect", "ignore"); ProjectSettings::get_singleton()->set_custom_property_info("display/window/stretch/aspect", PropertyInfo(Variant::STRING, "display/window/stretch/aspect", PROPERTY_HINT_ENUM, "ignore,keep,keep_width,keep_height,expand")); GLOBAL_DEF("display/window/stretch/shrink", 1.0); |