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

Improve fill aligned text hit testing.

Browse Source
This commit is contained in:
bruvzg
2020-12-21 11:57:35 +02:00
parent 784f869f0f
commit cc4d6eb7f6
1 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
servers/text_server.cpp
View File

@@ -1038,11 +1038,17 @@ int TextServer::shaped_text_hit_test_position(RID p_shaped, float p_coords) cons
float off = 0.0f; float off = 0.0f;
for (int i = 0; i < v_size; i++) { for (int i = 0; i < v_size; i++) {
for (int k = 0; k < glyphs[i].repeat; k++) {
if (glyphs[i].count > 0) { if (glyphs[i].count > 0) {
float advance = 0.f; float advance = 0.f;
for (int j = 0; j < glyphs[i].count; j++) { for (int j = 0; j < glyphs[i].count; j++) {
advance += glyphs[i + j].advance; advance += glyphs[i + j].advance * glyphs[i + j].repeat;
}
if (((glyphs[i].flags & GRAPHEME_IS_VIRTUAL) == GRAPHEME_IS_VIRTUAL) && (p_coords >= off && p_coords < off + advance)) {
if ((glyphs[i].flags & GRAPHEME_IS_RTL) == GRAPHEME_IS_RTL) {
return glyphs[i].end;
} else {
return glyphs[i].start;
}
} }
// Place caret to the left of clicked grapheme. // Place caret to the left of clicked grapheme.
if (p_coords >= off && p_coords < off + advance / 2) { if (p_coords >= off && p_coords < off + advance / 2) {
@@ -1061,8 +1067,7 @@ int TextServer::shaped_text_hit_test_position(RID p_shaped, float p_coords) cons
} }
} }
} }
off += glyphs[i].advance; off += glyphs[i].advance * glyphs[i].repeat;
}
} }
return 0; return 0;
} }