godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #81064 from bruvzg/rtl_char_count_line_edge 

[RTL] Fix character line index for non-visual characters and characters on the line edge.
This commit is contained in:
Rémi Verschelde 2023-08-28 12:12:22 +02:00
parent b3811a3e4f 2273509721
commit 713bfaf5ea
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scene/gui/rich_text_label.cpp
View File

@ -5876,13 +5876,21 @@ int RichTextLabel::get_character_line(int p_char) {
int char_offset = main->lines[i].char_offset; int char_offset = main->lines[i].char_offset;
int char_count = main->lines[i].char_count; int char_count = main->lines[i].char_count;
if (char_offset <= p_char && p_char < char_offset + 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); Vector2i range = main->lines[i].text_buf->get_line_range(j);
if (char_offset + range.x <= p_char && p_char <= char_offset + range.y) { if (char_offset + range.x <= p_char && p_char < char_offset + range.y) {
return line_count; 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 { } else {
line_count += main->lines[i].text_buf->get_line_count(); line_count += main->lines[i].text_buf->get_line_count();
} }