diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-06-09 22:07:19 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-06-09 22:07:19 -0300 |
| commit | 678563a3b9352655acdb298342e1a1b47e02c976 (patch) | |
| tree | 5482c02697a953d12ffe1154d60e82292cf700ab /scene/gui | |
| parent | 8266cf46b5f680f4382318d1f95c8ca935d2c5a2 (diff) | |
| parent | ae1e43afef3eaa2c5dc0522e40d245672210a89e (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/label.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index 09c6a77b42..8652aab649 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -488,9 +488,9 @@ void Label::regenerate_word_cache() { if (!autowrap) { minsize.width=width; if (max_lines_visible > 0 && line_count > max_lines_visible) { - minsize.height=(font->get_height()+line_spacing)*max_lines_visible; + minsize.height=(font->get_height() * max_lines_visible) + (line_spacing * (max_lines_visible - 1)); } else { - minsize.height=(font->get_height()+line_spacing)*line_count; + minsize.height=(font->get_height() * line_count)+(line_spacing * (line_count - 1)); } } |