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/button.cpp | |
| parent | 3c39aa8302a4f07a1470685bbf66f883c49f571e (diff) | |
| parent | 7961a1dea3e7ce8c4e7197a0000e35ab31e9ff2e (diff) | |
Merge pull request #45845 from qarmin/cppcheck_scene_2
Initialize class variables with default values in scene/ [2/2]
Diffstat (limited to 'scene/gui/button.cpp')
| -rw-r--r-- | scene/gui/button.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp index 8b3daf79a8..e50b2d7cfe 100644 --- a/scene/gui/button.cpp +++ b/scene/gui/button.cpp @@ -203,7 +203,7 @@ void Button::_notification(int p_what) { color_icon.a = 0.4; } - float icon_ofs_region = 0; + float icon_ofs_region = 0.0; if (rtl) { if (_internal_margin[SIDE_RIGHT] > 0) { icon_ofs_region = _internal_margin[SIDE_RIGHT] + get_theme_constant("hseparation"); @@ -544,16 +544,8 @@ Button::Button(const String &p_text) { text_buf.instance(); text_buf->set_flags(TextServer::BREAK_MANDATORY); - flat = false; - clip_text = false; - expand_icon = false; set_mouse_filter(MOUSE_FILTER_STOP); set_text(p_text); - align = ALIGN_CENTER; - - for (int i = 0; i < 4; i++) { - _internal_margin[i] = 0; - } } Button::~Button() { |