godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5132 from godotengine/revert-5052-fix-label-min-size 

Revert "Fix min size bug of Label"
This commit is contained in:
Juan Linietsky 2016-06-09 21:58:22 -03:00 committed by GitHub
parent f4ff30dff0 45d1ffd611
commit ae1e43afef
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/gui/label.cpp
View File

@ -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()+line_spacing)*max_lines_visible; minsize.height=(font->get_height() * max_lines_visible) + (line_spacing * (max_lines_visible - 1));
} else { } else {
minsize.height=(font->get_height()+line_spacing)*line_count; minsize.height=(font->get_height() * line_count)+(line_spacing * (line_count - 1));
} }
} }