diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-10 20:06:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-10 20:06:12 +0100 |
| commit | e8f73124a7d97abc94cea3cf7fe5b5614f61a448 (patch) | |
| tree | ff99e368359d56d760c8617af1021d0313635e38 /scene/gui/box_container.cpp | |
| parent | 3c39aa8302a4f07a1470685bbf66f883c49f571e (diff) | |
| parent | 7961a1dea3e7ce8c4e7197a0000e35ab31e9ff2e (diff) | |
| download | redot-engine-e8f73124a7d97abc94cea3cf7fe5b5614f61a448.tar.gz | |
Merge pull request #45845 from qarmin/cppcheck_scene_2
Initialize class variables with default values in scene/ [2/2]
Diffstat (limited to 'scene/gui/box_container.cpp')
| -rw-r--r-- | scene/gui/box_container.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scene/gui/box_container.cpp b/scene/gui/box_container.cpp index a00d755c9c..c570438b6a 100644 --- a/scene/gui/box_container.cpp +++ b/scene/gui/box_container.cpp @@ -33,9 +33,9 @@ #include "margin_container.h" struct _MinSizeCache { - int min_size; - bool will_stretch; - int final_size; + int min_size = 0; + bool will_stretch = false; + int final_size = 0; }; void BoxContainer::_resort() { @@ -50,7 +50,7 @@ void BoxContainer::_resort() { int children_count = 0; int stretch_min = 0; int stretch_avail = 0; - float stretch_ratio_total = 0; + float stretch_ratio_total = 0.0; Map<Control *, _MinSizeCache> min_size_cache; for (int i = 0; i < get_child_count(); i++) { @@ -105,7 +105,7 @@ void BoxContainer::_resort() { has_stretched = true; bool refit_successful = true; //assume refit-test will go well - float error = 0; // Keep track of accumulated error in pixels + float error = 0.0; // Keep track of accumulated error in pixels for (int i = 0; i < get_child_count(); i++) { Control *c = Object::cast_to<Control>(get_child(i)); @@ -331,7 +331,6 @@ void BoxContainer::add_spacer(bool p_begin) { BoxContainer::BoxContainer(bool p_vertical) { vertical = p_vertical; - align = ALIGN_BEGIN; } void BoxContainer::_bind_methods() { |