raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c58f8db1325de3685abb8e64fde88e9538fadf5b
commit c58f8db1325de3685abb8e64fde88e9538fadf5b Author: Ali <[email protected]> Date: Sat Apr 18 17:36:11 2020 +0100 evas_textgrid: update text props to use current script font Summary: This update make the textgrid same as evas_text and evas_textblock to use current picked font for text_props instead of script_font This patch will fix terminology emoji rendering when used applying D11302. Reviewers: raster, woohyun Reviewed By: woohyun Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11729 --- src/lib/evas/canvas/evas_object_textgrid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c index 504e8c1ffa..1626349ea2 100644 --- a/src/lib/evas/canvas/evas_object_textgrid.c +++ b/src/lib/evas/canvas/evas_object_textgrid.c @@ -335,7 +335,7 @@ evas_object_textgrid_row_text_append(Evas_Object_Textgrid_Row *row, script, &codepoint, 1); memset(&(text->text_props), 0, sizeof(Evas_Text_Props)); evas_common_text_props_script_set(&(text->text_props), script); - ENFN->font_text_props_info_create(ENC, script_fi, &codepoint, + ENFN->font_text_props_info_create(ENC, cur_fi, &codepoint, &(text->text_props), NULL, 0, 1, EVAS_TEXT_PROPS_MODE_NONE, o->cur.font_description_normal->lang); @@ -991,7 +991,7 @@ _alternate_font_weight_slant(Evas_Object_Protected_Data *obj, script, W, 1); memset(&text_props, 0, sizeof(Evas_Text_Props)); evas_common_text_props_script_set(&text_props, script); - ENFN->font_text_props_info_create(ENC, script_fi, W, &text_props, + ENFN->font_text_props_info_create(ENC, cur_fi, W, &text_props, NULL, 0, 1, EVAS_TEXT_PROPS_MODE_NONE, fdesc->lang); @@ -1073,7 +1073,7 @@ _evas_textgrid_font_reload(Eo *eo_obj, Evas_Textgrid_Data *o) script, W, 1); memset(&text_props, 0, sizeof(Evas_Text_Props)); evas_common_text_props_script_set(&text_props, script); - ENFN->font_text_props_info_create(ENC, script_fi, W, &text_props, + ENFN->font_text_props_info_create(ENC, cur_fi, W, &text_props, NULL, 0, 1, EVAS_TEXT_PROPS_MODE_NONE, fdesc->lang); --
