Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #108911 from DanielSnd/fix-richtextlabel-nested-table-sizing

Browse source 
Fix RichTextLabel nested tables not sizing properly.
This commit is contained in:
Thaddeus Crews 2025-07-30 09:03:50 -05:00
commit da3f2a9cf5
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
scene/gui/rich_text_label.cpp
View file

@ -404,18 +404,22 @@ float RichTextLabel::_resize_line(ItemFrame *p_frame, int p_line, const Ref<Font
table->columns[i].width = 0; table->columns[i].width = 0;
} }
const int available_width = p_width - theme_cache.table_h_separation * (col_count - 1);
int base_column_width = available_width / col_count;
for (Item *E : table->subitems) { for (Item *E : table->subitems) {
ERR_CONTINUE(E->type != ITEM_FRAME); // Children should all be frames. ERR_CONTINUE(E->type != ITEM_FRAME); // Children should all be frames.
ItemFrame *frame = static_cast<ItemFrame *>(E); ItemFrame *frame = static_cast<ItemFrame *>(E);
float prev_h = 0; float prev_h = 0;
for (int i = 0; i < (int)frame->lines.size(); i++) { for (int i = 0; i < (int)frame->lines.size(); i++) {
MutexLock sub_lock(frame->lines[i].text_buf->get_mutex()); MutexLock sub_lock(frame->lines[i].text_buf->get_mutex());
int w = _find_margin(frame->lines[i].from, p_base_font, p_base_font_size) + 1; int w = base_column_width - frame->padding.position.x - frame->padding.size.x;
w = MAX(w, _find_margin(frame->lines[i].from, p_base_font, p_base_font_size) + 1);
prev_h = _resize_line(frame, i, p_base_font, p_base_font_size, w, prev_h); prev_h = _resize_line(frame, i, p_base_font, p_base_font_size, w, prev_h);
} }
} }
const int available_width = p_width - theme_cache.table_h_separation * (col_count - 1);
_set_table_size(table, available_width); _set_table_size(table, available_width);
int row_idx = (table->align_to_row < 0) ? table->rows_baseline.size() - 1 : table->align_to_row; int row_idx = (table->align_to_row < 0) ? table->rows_baseline.size() - 1 : table->align_to_row;
@ -619,7 +623,7 @@ float RichTextLabel::_shape_line(ItemFrame *p_frame, int p_line, const Ref<Font>
} }
// Compute minimum width for each cell. // Compute minimum width for each cell.
const int available_width = p_width - theme_cache.table_h_separation * (col_count - 1); const int available_width = p_width - theme_cache.table_h_separation * (col_count - 1);
int base_column_width = available_width / col_count;
int idx = 0; int idx = 0;
for (Item *E : table->subitems) { for (Item *E : table->subitems) {
ERR_CONTINUE(E->type != ITEM_FRAME); // Children should all be frames. ERR_CONTINUE(E->type != ITEM_FRAME); // Children should all be frames.
@ -643,6 +647,17 @@ float RichTextLabel::_shape_line(ItemFrame *p_frame, int p_line, const Ref<Font>
} }
idx++; idx++;
} }
for (Item *E : table->subitems) {
ERR_CONTINUE(E->type != ITEM_FRAME); // Children should all be frames.
ItemFrame *frame = static_cast<ItemFrame *>(E);
float prev_h = 0;
for (int i = 0; i < (int)frame->lines.size(); i++) {
int w = base_column_width - frame->padding.position.x - frame->padding.size.x;
w = MAX(w, _find_margin(frame->lines[i].from, p_base_font, p_base_font_size) + 1);
prev_h = _resize_line(frame, i, p_base_font, p_base_font_size, w, prev_h);
}
}
_set_table_size(table, available_width); _set_table_size(table, available_width);