diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-04 22:03:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-04 22:03:29 +0200 |
| commit | daa1220a8605be05a2d0cd1c2def71238fcb15ac (patch) | |
| tree | ace73f431b1a5d7b0e9d19c669bee94ba66d6b24 | |
| parent | f6431db9a59b4593ddab93ed685b3fb9562ebe40 (diff) | |
| parent | efcdfc2332a4b59ae8d42986932a06bf3d834c76 (diff) | |
Merge pull request #61856 from iwek7/label_overflowing_text
| -rw-r--r-- | scene/gui/rich_text_label.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index 8e424977c4..984f20ee58 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -821,17 +821,18 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o off.y += line_spacing; } - RID rid = l.text_buf->get_line_rid(line); if (p_ofs.y + off.y >= ctrl_size.height) { break; } - if (p_ofs.y + off.y + TS->shaped_text_get_size(rid).y <= 0) { - off.y += TS->shaped_text_get_size(rid).y; + + const Size2 line_size = l.text_buf->get_line_size(line); + if (p_ofs.y + off.y + line_size.y <= 0) { + off.y += line_size.y; continue; } float width = l.text_buf->get_width(); - float length = TS->shaped_text_get_width(rid); + float length = line_size.x; // Draw line. line_count++; @@ -874,6 +875,7 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o } } + RID rid = l.text_buf->get_line_rid(line); //draw_rect(Rect2(p_ofs + off, TS->shaped_text_get_size(rid)), Color(1,0,0), false, 2); //DEBUG_RECTS off.y += TS->shaped_text_get_ascent(rid); |