godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix window display shrink can't set to float numbers

Browse Source
This commit is contained in:
geequlim 2017-10-19 22:12:46 +08:00 committed by Rémi Verschelde
parent cf5eded982
commit eeacae563c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/main.cpp
View File

@ -1350,7 +1350,7 @@ bool Main::start() {
String stretch_mode = GLOBAL_DEF("display/window/stretch/mode", "disabled"); String stretch_mode = GLOBAL_DEF("display/window/stretch/mode", "disabled");
String stretch_aspect = GLOBAL_DEF("display/window/stretch/aspect", "ignore"); String stretch_aspect = GLOBAL_DEF("display/window/stretch/aspect", "ignore");
Size2i stretch_size = Size2(GLOBAL_DEF("display/window/size/width", 0), GLOBAL_DEF("display/window/size/height", 0)); Size2i stretch_size = Size2(GLOBAL_DEF("display/window/size/width", 0), GLOBAL_DEF("display/window/size/height", 0));
int stretch_shrink = GLOBAL_DEF("display/window/stretch/shrink", 1); real_t stretch_shrink = GLOBAL_DEF("display/window/stretch/shrink", 1.0f);
SceneTree::StretchMode sml_sm = SceneTree::STRETCH_MODE_DISABLED; SceneTree::StretchMode sml_sm = SceneTree::STRETCH_MODE_DISABLED;
if (stretch_mode == "2d") if (stretch_mode == "2d")

2
scene/main/scene_tree.cpp
View File

@ -1172,7 +1172,7 @@ void SceneTree::_update_root_rect() {
} }
} }
void SceneTree::set_screen_stretch(StretchMode p_mode, StretchAspect p_aspect, const Size2 p_minsize, int p_shrink) { void SceneTree::set_screen_stretch(StretchMode p_mode, StretchAspect p_aspect, const Size2 p_minsize, real_t p_shrink) {
stretch_mode = p_mode; stretch_mode = p_mode;
stretch_aspect = p_aspect; stretch_aspect = p_aspect;

4
scene/main/scene_tree.h
View File

@ -147,7 +147,7 @@ private:
StretchMode stretch_mode; StretchMode stretch_mode;
StretchAspect stretch_aspect; StretchAspect stretch_aspect;
Size2i stretch_min; Size2i stretch_min;
int stretch_shrink; real_t stretch_shrink;
void _update_root_rect(); void _update_root_rect();
@ -415,7 +415,7 @@ public:
void get_nodes_in_group(const StringName &p_group, List<Node *> *p_list); void get_nodes_in_group(const StringName &p_group, List<Node *> *p_list);
bool has_group(const StringName &p_identifier) const; bool has_group(const StringName &p_identifier) const;
void set_screen_stretch(StretchMode p_mode, StretchAspect p_aspect, const Size2 p_minsize, int p_shrink = 1); void set_screen_stretch(StretchMode p_mode, StretchAspect p_aspect, const Size2 p_minsize, real_t p_shrink = 1);
//void change_scene(const String& p_path); //void change_scene(const String& p_path);
//Node *get_loaded_scene(); //Node *get_loaded_scene();