summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-07-30 19:09:12 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-07-30 19:09:12 +0200
commit6883087ac7dac530062b24b5ea918904589a89c2 (patch)
tree2cf7d27776a5dfe4833812391b8b5b1efe3ae584 /src/bin
parent29d24aa409371bd0252b34eb54b1adcb256ca2a1 (diff)
Revert "evas_object_textblock: add support for variation sequences"
This reverts commit f7ce771e3243e19f8a12672ea2be752dedccbcf6.
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/elementary/test.c2
-rw-r--r--src/bin/elementary/test_label.c24
2 files changed, 0 insertions, 26 deletions
diff --git a/src/bin/elementary/test.c b/src/bin/elementary/test.c
index 1a332575da..5264ab146a 100644
--- a/src/bin/elementary/test.c
+++ b/src/bin/elementary/test.c
@@ -243,7 +243,6 @@ void test_label_wrap(void *data, Evas_Object *obj, void *event_info);
243void test_label_ellipsis(void *data, Evas_Object *obj, void *event_info); 243void test_label_ellipsis(void *data, Evas_Object *obj, void *event_info);
244void test_label_colors(void *data, Evas_Object *obj, void *event_info); 244void test_label_colors(void *data, Evas_Object *obj, void *event_info);
245void test_label_emoji(void *data, Evas_Object *obj, void *event_info); 245void test_label_emoji(void *data, Evas_Object *obj, void *event_info);
246void test_label_variation_sequence(void *data, Evas_Object *obj, void *event_info);
247void test_conformant(void *data, Evas_Object *obj, void *event_info); 246void test_conformant(void *data, Evas_Object *obj, void *event_info);
248void test_conformant2(void *data, Evas_Object *obj, void *event_info); 247void test_conformant2(void *data, Evas_Object *obj, void *event_info);
249void test_conformant_indicator(void *data, Evas_Object *obj, void *event_info); 248void test_conformant_indicator(void *data, Evas_Object *obj, void *event_info);
@@ -1204,7 +1203,6 @@ add_tests:
1204 ADD_TEST(NULL, "Text", "Label Ellipsis", test_label_ellipsis); 1203 ADD_TEST(NULL, "Text", "Label Ellipsis", test_label_ellipsis);
1205 ADD_TEST(NULL, "Text", "Label Colors", test_label_colors); 1204 ADD_TEST(NULL, "Text", "Label Colors", test_label_colors);
1206 ADD_TEST(NULL, "Text", "Label Emoji", test_label_emoji); 1205 ADD_TEST(NULL, "Text", "Label Emoji", test_label_emoji);
1207 ADD_TEST(NULL, "Text", "Label Variation Sequnece", test_label_variation_sequence);
1208 ADD_TEST_EO(NULL, "Text", "Efl.Ui.Textpath", test_ui_textpath); 1206 ADD_TEST_EO(NULL, "Text", "Efl.Ui.Textpath", test_ui_textpath);
1209 1207
1210 //------------------------------// 1208 //------------------------------//
diff --git a/src/bin/elementary/test_label.c b/src/bin/elementary/test_label.c
index f49255f21e..c00ae7986e 100644
--- a/src/bin/elementary/test_label.c
+++ b/src/bin/elementary/test_label.c
@@ -401,30 +401,6 @@ test_label_colors(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev
401 evas_object_show(win); 401 evas_object_show(win);
402} 402}
403 403
404/*** Label variation sequence **************************************************************/
405void
406test_label_variation_sequence(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
407{
408 Evas_Object *win, *lb;
409
410 win = elm_win_util_standard_add("label-variation sequence", "Label variation sequnece");
411 elm_win_autodel_set(win, EINA_TRUE);
412
413 lb = elm_label_add(win);
414 elm_object_text_set(lb,
415 "You need to have at least on font contains variation sequence<br>"
416 "Three different 8 glyphs : <br>"
417 "8<tab>8&#xfe0f;<tab>8&#xfe0f;&#x20E3;<br>"
418 "line with 3 variation glyphs : <br>"
419 "8&#xfe0f;&#x20E3;&#x262a;&#xfe0f;AAA&#x262a;&#xfe0E;1234567&#xfe0f;&#x20E3;"
420 );
421 evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
422 elm_win_resize_object_add(win, lb);
423 evas_object_show(lb);
424
425 evas_object_show(win);
426}
427
428/*** Label Emoji *************************************************************/ 404/*** Label Emoji *************************************************************/
429static char * 405static char *
430_fontlist_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED) 406_fontlist_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED)