rggammon
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Ali Alzyod 2020-04-18 17:36:11 +01:00 committed by Carsten Haitzler (Rasterman)
parent b41aac6caa
commit c58f8db132
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/evas/canvas/evas_object_textgrid.c
View File

@ -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);