From 57842ad129aa3f7bf8131123fed88503cd306373 Mon Sep 17 00:00:00 2001 From: Youngbok Shin Date: Thu, 18 Aug 2016 22:18:55 +0900 Subject: [PATCH] Revert "Evas text: fix RTL text ellipsis issues" This reverts commit 26102b1ddfd131ce84c449a592aa608d8d586a6f. Change-Id: Ic7e978e5a3bdc449f40228dfa4a9c939133f32ff Signed-off-by: Youngbok Shin --- src/lib/evas/canvas/evas_object_text.c | 35 ---------------------------------- 1 file changed, 35 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c index 6b86d63..6c60d30 100644 --- a/src/lib/evas/canvas/evas_object_text.c +++ b/src/lib/evas/canvas/evas_object_text.c @@ -870,52 +870,25 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Text_Data *o, Eina_Unicode *t } if (itr && (itr != start_ellip_it)) { - /* TIZEN_ONLY(20160517): fix RTL text ellipsis issues int cut = 1 + ENFN->font_last_up_to_pos(ENDT, o->font, &itr->text_props, ellipsis_coord - (advance + l + r), 0); if (cut > 0) - */ - int cut = ENFN->font_last_up_to_pos(ENDT, - o->font, - &itr->text_props, - ellipsis_coord - (advance + l + r), - 0); - if (cut >= 0) - /* END */ { start_ellip_it->text_pos = itr->text_pos; - /* TIZEN_ONLY(20160517): fix RTL text ellipsis issues start_ellip_it->visual_pos = itr->visual_pos; if (!_layout_text_item_trim(obj, o, itr, cut, EINA_FALSE)) - */ - - if (itr->text_props.bidi_dir == EVAS_BIDI_DIRECTION_RTL) - start_ellip_it->visual_pos = itr->visual_pos + cut + 1; - else - start_ellip_it->visual_pos = itr->visual_pos; - - if (!_layout_text_item_trim(obj, o, itr, cut + 1, EINA_FALSE)) - /* END */ { _evas_object_text_item_del(o, itr); } } } - /* TIZEN_ONLY(20160517): fix RTL text ellipsis issues o->items = (Evas_Object_Text_Item *) eina_inlist_remove(EINA_INLIST_GET(o->items), EINA_INLIST_GET(start_ellip_it)); o->items = (Evas_Object_Text_Item *) eina_inlist_prepend(EINA_INLIST_GET(o->items), EINA_INLIST_GET(start_ellip_it)); - */ - if (!o->bidi_par_props) - { - o->items = (Evas_Object_Text_Item *) eina_inlist_remove(EINA_INLIST_GET(o->items), EINA_INLIST_GET(start_ellip_it)); - o->items = (Evas_Object_Text_Item *) eina_inlist_prepend(EINA_INLIST_GET(o->items), EINA_INLIST_GET(start_ellip_it)); - } - /* END */ } if (end_ellip_it) @@ -953,15 +926,7 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Text_Data *o, Eina_Unicode *t if (cut >= 0) { end_ellip_it->text_pos = itr->text_pos + cut; - /* TIZEN_ONLY(20160517): fix RTL text ellipsis issues end_ellip_it->visual_pos = itr->visual_pos + cut; - */ - - if (itr->text_props.bidi_dir == EVAS_BIDI_DIRECTION_RTL) - end_ellip_it->visual_pos = itr->visual_pos - 1; - else - end_ellip_it->visual_pos = itr->visual_pos + cut; - /* END */ if (_layout_text_item_trim(obj, o, itr, cut, EINA_TRUE)) { itr = (Evas_Object_Text_Item *) EINA_INLIST_GET(itr)->next; -- 2.7.4