Browse Source

Merge pull request #5052 from volzhs/fix-label-min-size

Fix min size bug of Label
Rémi Verschelde 9 years ago
parent
commit
a0ac4293c1
1 changed files with 2 additions and 2 deletions
  1. 2 2
      scene/gui/label.cpp

+ 2 - 2
scene/gui/label.cpp

@@ -488,9 +488,9 @@ void Label::regenerate_word_cache() {
 	if (!autowrap) {
 	if (!autowrap) {
 		minsize.width=width;
 		minsize.width=width;
 		if (max_lines_visible > 0 && line_count > max_lines_visible) {
 		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 {
 		} else {
-			minsize.height=(font->get_height() * line_count)+(line_spacing * (line_count - 1));
+			minsize.height=(font->get_height()+line_spacing)*line_count;
 		}
 		}
 	}
 	}