godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #101205 from voylin/get_visible_line_count_fix

Browse Source 
Fix `get_visible_line_count` in RichTextLabel
This commit is contained in:
Rémi Verschelde
2025-01-09 13:50:51 +01:00
parent ef9f0aefd0 3e333df623
commit 2e657bf2ae
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scene/gui/rich_text_label.cpp
View File

@@ -819,6 +819,7 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
} }
int line_count = 0; int line_count = 0;
bool has_visible_chars = false;
// Bottom margin for text clipping. // Bottom margin for text clipping.
float v_limit = theme_cache.normal_style->get_margin(SIDE_BOTTOM); float v_limit = theme_cache.normal_style->get_margin(SIDE_BOTTOM);
Size2 ctrl_size = get_size(); Size2 ctrl_size = get_size();
@@ -842,8 +843,6 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
float length = l.text_buf->get_line_size(line).x; float length = l.text_buf->get_line_size(line).x;
// Draw line. // Draw line.
line_count++;
if (rtl) { if (rtl) {
off.x = p_width - l.offset.x - width; off.x = p_width - l.offset.x - width;
if (!lrtl && p_frame == main) { // Skip Scrollbar. if (!lrtl && p_frame == main) { // Skip Scrollbar.
@@ -1306,6 +1305,7 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
bool skip = (trim_chars && l.char_offset + glyphs[i].end > visible_characters) || (trim_glyphs_ltr && (processed_glyphs_step >= visible_glyphs)) || (trim_glyphs_rtl && (processed_glyphs_step < total_glyphs - visible_glyphs)); bool skip = (trim_chars && l.char_offset + glyphs[i].end > visible_characters) || (trim_glyphs_ltr && (processed_glyphs_step >= visible_glyphs)) || (trim_glyphs_rtl && (processed_glyphs_step < total_glyphs - visible_glyphs));
if (!skip) { if (!skip) {
if (txt_visible) { if (txt_visible) {
has_visible_chars = true;
if (step == DRAW_STEP_TEXT) { if (step == DRAW_STEP_TEXT) {
if (frid != RID()) { if (frid != RID()) {
TS->font_draw_glyph(frid, ci, glyphs[i].font_size, fx_offset + char_off, gl, font_color); TS->font_draw_glyph(frid, ci, glyphs[i].font_size, fx_offset + char_off, gl, font_color);
@@ -1426,6 +1426,10 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
r_processed_glyphs = processed_glyphs_step; r_processed_glyphs = processed_glyphs_step;
off.y += TS->shaped_text_get_descent(rid); off.y += TS->shaped_text_get_descent(rid);
if (has_visible_chars) {
line_count++;
has_visible_chars = false;
}
} }
return line_count; return line_count;