summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli <ali198724@gmail.com>2020-04-18 17:36:11 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-04-18 17:36:11 +0100
commitc58f8db1325de3685abb8e64fde88e9538fadf5b (patch)
tree5d626a95bcd4ed58ed08c739216aa0d6c55db9ea
parentb41aac6caa182819bcd39891402a7be1d664316d (diff)
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
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c6
1 files 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,
335 script, &codepoint, 1); 335 script, &codepoint, 1);
336 memset(&(text->text_props), 0, sizeof(Evas_Text_Props)); 336 memset(&(text->text_props), 0, sizeof(Evas_Text_Props));
337 evas_common_text_props_script_set(&(text->text_props), script); 337 evas_common_text_props_script_set(&(text->text_props), script);
338 ENFN->font_text_props_info_create(ENC, script_fi, &codepoint, 338 ENFN->font_text_props_info_create(ENC, cur_fi, &codepoint,
339 &(text->text_props), NULL, 0, 1, 339 &(text->text_props), NULL, 0, 1,
340 EVAS_TEXT_PROPS_MODE_NONE, 340 EVAS_TEXT_PROPS_MODE_NONE,
341 o->cur.font_description_normal->lang); 341 o->cur.font_description_normal->lang);
@@ -991,7 +991,7 @@ _alternate_font_weight_slant(Evas_Object_Protected_Data *obj,
991 script, W, 1); 991 script, W, 1);
992 memset(&text_props, 0, sizeof(Evas_Text_Props)); 992 memset(&text_props, 0, sizeof(Evas_Text_Props));
993 evas_common_text_props_script_set(&text_props, script); 993 evas_common_text_props_script_set(&text_props, script);
994 ENFN->font_text_props_info_create(ENC, script_fi, W, &text_props, 994 ENFN->font_text_props_info_create(ENC, cur_fi, W, &text_props,
995 NULL, 0, 1, 995 NULL, 0, 1,
996 EVAS_TEXT_PROPS_MODE_NONE, 996 EVAS_TEXT_PROPS_MODE_NONE,
997 fdesc->lang); 997 fdesc->lang);
@@ -1073,7 +1073,7 @@ _evas_textgrid_font_reload(Eo *eo_obj, Evas_Textgrid_Data *o)
1073 script, W, 1); 1073 script, W, 1);
1074 memset(&text_props, 0, sizeof(Evas_Text_Props)); 1074 memset(&text_props, 0, sizeof(Evas_Text_Props));
1075 evas_common_text_props_script_set(&text_props, script); 1075 evas_common_text_props_script_set(&text_props, script);
1076 ENFN->font_text_props_info_create(ENC, script_fi, W, &text_props, 1076 ENFN->font_text_props_info_create(ENC, cur_fi, W, &text_props,
1077 NULL, 0, 1, 1077 NULL, 0, 1,
1078 EVAS_TEXT_PROPS_MODE_NONE, 1078 EVAS_TEXT_PROPS_MODE_NONE,
1079 fdesc->lang); 1079 fdesc->lang);