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

Fixed 0 width issue of rich text label 

Fixes #37746

(cherry picked from commit 5e64c146bc)
This commit is contained in:
janglee 2020-04-13 14:59:38 +05:30 committed by Rémi Verschelde
parent 8bbcc624fd
commit a1155b86e4
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/rich_text_label.cpp
View File

@ -414,7 +414,7 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
cw = tab_size * font->get_char_size(' ').width; cw = tab_size * font->get_char_size(' ').width;
} }
if (end > 0 && w + cw + begin > p_width) { if (end > 0 && fw + cw + begin > p_width) {
break; //don't allow lines longer than assigned width break; //don't allow lines longer than assigned width
} }
@ -442,7 +442,7 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
end++; end++;
} }
CHECK_HEIGHT(fh); CHECK_HEIGHT(fh);
ENSURE_WIDTH(w); ENSURE_WIDTH(fw);
line_ascent = MAX(line_ascent, ascent); line_ascent = MAX(line_ascent, ascent);
line_descent = MAX(line_descent, descent); line_descent = MAX(line_descent, descent);