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

Revert "Fixed 0 width issue of rich text label"

Browse source 
This reverts commit a1155b86e4.
This commit is contained in:
Haoyu Qiu 2022-03-16 17:40:09 +08:00
parent cd76891dbf
commit fd968157a4
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

@ -415,7 +415,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 && fw + cw + begin > p_width) { if (end > 0 && w + cw + begin > p_width) {
break; //don't allow lines longer than assigned width break; //don't allow lines longer than assigned width
} }
@ -443,7 +443,7 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
end++; end++;
} }
CHECK_HEIGHT(fh); CHECK_HEIGHT(fh);
ENSURE_WIDTH(fw); ENSURE_WIDTH(w);
line_ascent = MAX(line_ascent, ascent); line_ascent = MAX(line_ascent, ascent);
line_descent = MAX(line_descent, descent); line_descent = MAX(line_descent, descent);