asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/godotengine/godot

Browse source
This commit is contained in:
Juan Linietsky 2016-06-09 22:07:19 -03:00
commit 678563a3b9
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) {
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));
}
}