From 227350972148797bfe573836fc6b7f80abcee84e Mon Sep 17 00:00:00 2001 From: bruvzg <7645683+bruvzg@users.noreply.github.com> Date: Mon, 28 Aug 2023 10:50:01 +0300 Subject: [PATCH] [RTL] Fix character line index for non-visual characters and characters on the line edge. --- scene/gui/rich_text_label.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index ed5037ca1de..714b3a025a4 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -5875,13 +5875,21 @@ int RichTextLabel::get_character_line(int p_char) { int char_offset = main->lines[i].char_offset; int char_count = main->lines[i].char_count; if (char_offset <= p_char && p_char < char_offset + char_count) { - for (int j = 0; j < main->lines[i].text_buf->get_line_count(); j++) { + int lc = main->lines[i].text_buf->get_line_count(); + for (int j = 0; j < lc; j++) { Vector2i range = main->lines[i].text_buf->get_line_range(j); - if (char_offset + range.x <= p_char && p_char <= char_offset + range.y) { - return line_count; + if (char_offset + range.x <= p_char && p_char < char_offset + range.y) { + break; + } + if (char_offset + range.x > p_char && line_count > 0) { + line_count--; // Character is not rendered and is between the lines (e.g., edge space). + break; + } + if (j != lc - 1) { + line_count++; } - line_count++; } + return line_count; } else { line_count += main->lines[i].text_buf->get_line_count(); }