Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #56649 from bruvzg/ts_fix_bmp_gl_index_and_text_edit_rounding

Browse source 
Fix glyph index for bitmap fonts and glyph positions in the TextEdit.
This commit is contained in:
Rémi Verschelde 2022-01-10 09:11:30 +01:00 • committed by GitHub
commit d746475708
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/text_server_adv/text_server_adv.cpp
View file

@ -2573,7 +2573,7 @@ int32_t TextServerAdvanced::font_get_glyph_index(RID p_font_rid, int p_size, cha
return FT_Get_Char_Index(fd->cache[size]->face, p_char);
}
} else {
return 0;
return (int32_t)p_char;
}
#else
return (int32_t)p_char;

4
scene/gui/text_edit.cpp
View file

@ -1135,7 +1135,7 @@ void TextEdit::_notification(int p_what) {
int first_visible_char = TS->shaped_text_get_range(rid).y;
int last_visible_char = TS->shaped_text_get_range(rid).x;
int char_ofs = 0;
float char_ofs = 0;
if (outline_size > 0 && outline_color.a > 0) {
for (int j = 0; j < gl_size; j++) {
for (int k = 0; k < glyphs[j].repeat; k++) {
@ -1170,7 +1170,7 @@ void TextEdit::_notification(int p_what) {
}
}
int char_pos = char_ofs + char_margin + ofs_x;
float char_pos = char_ofs + char_margin + ofs_x;
if (char_pos >= xmargin_beg) {
if (highlight_matching_braces_enabled) {
if ((brace_open_match_line == line && brace_open_match_column == glyphs[j].start) ||