Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

[TextServer] Fix caret hit test rounding.

Browse source
This commit is contained in:
Pāvels Nadtočajevs 2025-08-07 22:40:30 +03:00
parent 80a219a58a
commit d13b5361b4
No known key found for this signature in database
GPG key ID: 8413210218EF35D2
4 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scene/gui/line_edit.cpp
View file

@ -1825,6 +1825,9 @@ void LineEdit::set_caret_at_pixel_pos(int p_x) {
} }
int ofs = std::ceil(TS->shaped_text_hit_test_position(text_rid, p_x - x_ofs - scroll_offset)); int ofs = std::ceil(TS->shaped_text_hit_test_position(text_rid, p_x - x_ofs - scroll_offset));
if (ofs == -1) {
return;
}
if (!caret_mid_grapheme_enabled) { if (!caret_mid_grapheme_enabled) {
ofs = TS->shaped_text_closest_character_pos(text_rid, ofs); ofs = TS->shaped_text_closest_character_pos(text_rid, ofs);
} }

6
scene/gui/rich_text_label.cpp
View file

@ -1770,11 +1770,13 @@ float RichTextLabel::_find_click_in_line(ItemFrame *p_frame, int p_line, const V
} }
} }
} else { } else {
char_pos = TS->shaped_text_hit_test_position(rid, p_click.x - rect.position.x); int click_char_pos = TS->shaped_text_hit_test_position(rid, p_click.x - rect.position.x);
char_pos = TS->shaped_text_closest_character_pos(rid, char_pos); if (click_char_pos != -1) {
char_pos = TS->shaped_text_closest_character_pos(rid, click_char_pos);
char_clicked = true; char_clicked = true;
} }
} }
}
line_clicked = true; line_clicked = true;
text_rect_begin = rtl ? rect.position.x + rect.size.x : rect.position.x; text_rect_begin = rtl ? rect.position.x + rect.size.x : rect.position.x;
} }

6
scene/gui/text_edit.cpp
View file

@ -5034,6 +5034,9 @@ Point2i TextEdit::get_line_column_at_pos(const Point2i &p_pos, bool p_clamp_line
} }
int col = TS->shaped_text_hit_test_position(text_rid, colx); int col = TS->shaped_text_hit_test_position(text_rid, colx);
if (col == -1) {
return Point2i(-1, -1);
}
if (!caret_mid_grapheme_enabled) { if (!caret_mid_grapheme_enabled) {
col = TS->shaped_text_closest_character_pos(text_rid, col); col = TS->shaped_text_closest_character_pos(text_rid, col);
} }
@ -8197,6 +8200,9 @@ int TextEdit::_get_char_pos_for_line(int p_px, int p_line, int p_wrap_index) con
p_px -= wrap_indent; p_px -= wrap_indent;
} }
int ofs = TS->shaped_text_hit_test_position(text_rid, p_px); int ofs = TS->shaped_text_hit_test_position(text_rid, p_px);
if (ofs == -1) {
return 0;
}
if (!caret_mid_grapheme_enabled) { if (!caret_mid_grapheme_enabled) {
ofs = TS->shaped_text_closest_character_pos(text_rid, ofs); ofs = TS->shaped_text_closest_character_pos(text_rid, ofs);
} }

7
servers/text_server.cpp
View file

@ -1539,7 +1539,7 @@ int64_t TextServer::shaped_text_hit_test_position(const RID &p_shaped, double p_
// Cursor placement hit test. // Cursor placement hit test.
// Place caret to the left of the leftmost grapheme, or to position 0 if string is empty. // Place caret to the left of the leftmost grapheme, or to position 0 if string is empty.
if (p_coords <= 0) { if (Math::floor(p_coords) <= 0) {
if (v_size > 0) { if (v_size > 0) {
if ((glyphs[0].flags & GRAPHEME_IS_RTL) == GRAPHEME_IS_RTL) { if ((glyphs[0].flags & GRAPHEME_IS_RTL) == GRAPHEME_IS_RTL) {
return glyphs[0].end; return glyphs[0].end;
@ -1552,7 +1552,7 @@ int64_t TextServer::shaped_text_hit_test_position(const RID &p_shaped, double p_
} }
// Place caret to the right of the rightmost grapheme, or to position 0 if string is empty. // Place caret to the right of the rightmost grapheme, or to position 0 if string is empty.
if (p_coords >= shaped_text_get_width(p_shaped)) { if (Math::ceil(p_coords) >= shaped_text_get_width(p_shaped)) {
if (v_size > 0) { if (v_size > 0) {
if ((glyphs[v_size - 1].flags & GRAPHEME_IS_RTL) == GRAPHEME_IS_RTL) { if ((glyphs[v_size - 1].flags & GRAPHEME_IS_RTL) == GRAPHEME_IS_RTL) {
return glyphs[v_size - 1].start; return glyphs[v_size - 1].start;
@ -1622,7 +1622,8 @@ int64_t TextServer::shaped_text_hit_test_position(const RID &p_shaped, double p_
} }
off += glyphs[i].advance * glyphs[i].repeat; off += glyphs[i].advance * glyphs[i].repeat;
} }
return 0;
return -1;
} }
Vector2 TextServer::shaped_text_get_grapheme_bounds(const RID &p_shaped, int64_t p_pos) const { Vector2 TextServer::shaped_text_get_grapheme_bounds(const RID &p_shaped, int64_t p_pos) const {