diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-06-05 17:14:59 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-06-05 17:14:59 +0200 |
| commit | a0ac4293c17d08ca985a54247c73aa6cd183fe0f (patch) | |
| tree | 5cc2035d1bd1ba8980dfff32ae31d2b6796ca310 | |
| parent | 56348cbbfe82c2f5e2b95875e0687b664cc6e2d8 (diff) | |
| parent | f792f63b030ad2306c0407492f03fd9508b70766 (diff) | |
Merge pull request #5052 from volzhs/fix-label-min-size
Fix min size bug of Label
| -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 8652aab649..09c6a77b42 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() * max_lines_visible) + (line_spacing * (max_lines_visible - 1)); + minsize.height=(font->get_height()+line_spacing)*max_lines_visible; } else { - minsize.height=(font->get_height() * line_count)+(line_spacing * (line_count - 1)); + minsize.height=(font->get_height()+line_spacing)*line_count; } } |