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

Merge pull request #47050 from jmb462/fix-bbcode-tables-overlap-with-bottom-text 

Fix BBCode tables overlap with bottom text (Fix #47012)
This commit is contained in:
Rémi Verschelde 2021-03-17 17:54:01 +01:00 committed by GitHub
parent 3150ef3427 25af026d9e
commit e57f6e2cca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scene/gui/rich_text_label.cpp
View File

@ -588,7 +588,8 @@ void RichTextLabel::_shape_line(ItemFrame *p_frame, int p_line, const Ref<Font>
offset.x += table->columns[column].width + hseparation + frame->padding.size.x;
row_height = MAX(yofs, row_height);
if (column == col_count - 1) {
// Add row height after last column of the row or last cell of the table.
if (column == col_count - 1 || E->next() == nullptr) {
offset.x = 0;
row_height += vseparation;
table->total_height += row_height;