summaryrefslogtreecommitdiff
path: root/src/lib/evas/common/evas_text_utils.c
diff options
context:
space:
mode:
authorAli Alzyod <ali198724@gmail.com>2019-12-12 16:22:12 +0900
committerWooHyun Jung <wh0705.jung@samsung.com>2019-12-12 16:22:12 +0900
commit2d7622491884843ce15e2717675b128af1bdbefc (patch)
treebadc8961affe622f541c3347e3b1b6d620bff898 /src/lib/evas/common/evas_text_utils.c
parentc62a7dae6316df60c6c47577743b62185ca56951 (diff)
evas_object_textblock: add support for variation sequences
Summary: update font processing to handle variation sequences unicodes to select proper glypg in respect to variation seqences Test Plan: ``` #define EFL_EO_API_SUPPORT 1 #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> #include <Efl.h> #include <Elementary.h> EAPI_MAIN int elm_main(int argc, char **argv) { Evas_Object *win, *textblock; elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); win = elm_win_util_standard_add("Main", ""); elm_win_autodel_set(win, EINA_TRUE); textblock = evas_object_textblock_add(win); efl_canvas_text_style_set(textblock,NULL,"DEFAULT='font=DejaVuSans font_fallbacks=SamsungColorEmoji color=#000 font_size=20'"); evas_object_textblock_text_markup_set(textblock, "8&#xfe0f;&#x20E3;&#x262a;&#xfe0f;AAA&#x262a;&#xfe0E;1234567&#xfe0f;&#x20E3;"); evas_object_size_hint_weight_set(textblock, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(textblock, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(textblock); evas_object_move(textblock, 0, 0); evas_object_resize(textblock, 320, 320); evas_object_resize(win, 320, 320); evas_object_show(win); elm_run(); return 0; } ELM_MAIN() ``` Reviewers: woohyun, bowonryu, segfaultxavi, cedric, bu5hm4n Reviewed By: woohyun, cedric Subscribers: raster, bu5hm4n, subodh6129, herdsman, segfaultxavi, zmike, cedric, #committers, #reviewers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9053
Diffstat (limited to '')
-rw-r--r--src/lib/evas/common/evas_text_utils.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/evas/common/evas_text_utils.c b/src/lib/evas/common/evas_text_utils.c
index e9c5cc2c94..acf7cf8fb7 100644
--- a/src/lib/evas/common/evas_text_utils.c
+++ b/src/lib/evas/common/evas_text_utils.c
@@ -1066,7 +1066,7 @@ _content_create_ot(RGBA_Font_Int *fi, const Eina_Unicode *text,
1066 /* If we got a malformed index, show the replacement char instead */ 1066 /* If we got a malformed index, show the replacement char instead */
1067 if (gl_itr->index == 0) 1067 if (gl_itr->index == 0)
1068 { 1068 {
1069 gl_itr->index = evas_common_get_char_index(fi, REPLACEMENT_CHAR); 1069 gl_itr->index = evas_common_get_char_index(fi, REPLACEMENT_CHAR, 0);
1070 is_replacement = EINA_TRUE; 1070 is_replacement = EINA_TRUE;
1071 } 1071 }
1072 idx = gl_itr->index; 1072 idx = gl_itr->index;
@@ -1172,10 +1172,10 @@ _content_create_regular(RGBA_Font_Int *fi, const Eina_Unicode *text,
1172 _gl = *text; 1172 _gl = *text;
1173 if (_gl == 0) break; 1173 if (_gl == 0) break;
1174 1174
1175 idx = evas_common_get_char_index(fi, _gl); 1175 idx = evas_common_get_char_index(fi, _gl, 0);
1176 if (idx == 0) 1176 if (idx == 0)
1177 { 1177 {
1178 idx = evas_common_get_char_index(fi, REPLACEMENT_CHAR); 1178 idx = evas_common_get_char_index(fi, REPLACEMENT_CHAR, 0);
1179 } 1179 }
1180 1180
1181 fg = evas_common_font_int_cache_glyph_get(fi, idx); 1181 fg = evas_common_font_int_cache_glyph_get(fi, idx);