summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scene/gui/rich_text_label.cpp16
1 files changed, 12 insertions, 4 deletions
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index b2dea05f2a..9ebcf18ff6 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/rich_text_label.cpp
@@ -5876,13 +5876,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();
}