From f9ebc7bdcd3239e3f7ed0ced73c6e6a79779901c Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Fri, 28 Dec 2012 00:58:10 +0000 Subject: [PATCH] evas: simplify logic for ellipsis. SVN revision: 81773 --- src/lib/evas/canvas/evas_object_text.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c index 2f0f229389..de99ebfef2 100644 --- a/src/lib/evas/canvas/evas_object_text.c +++ b/src/lib/evas/canvas/evas_object_text.c @@ -163,14 +163,12 @@ _evas_object_text_items_clean(Evas_Object_Protected_Data *obj, Evas_Object_Text o->cur.style == o->prev.style && obj->cur.scale == obj->prev.scale) { - if (o->last_computed.ellipsis_start && - o->last_computed.ellipsis_start == o->items) + if (o->last_computed.ellipsis_start) o->items = (Evas_Object_Text_Item *) eina_inlist_remove(EINA_INLIST_GET(o->items), - EINA_INLIST_GET(o->items)); - if (o->last_computed.ellipsis_end && - EINA_INLIST_GET(o->last_computed.ellipsis_end) == EINA_INLIST_GET(o->items)->last) + EINA_INLIST_GET(o->last_computed.ellipsis_start)); + if (o->last_computed.ellipsis_end) o->items = (Evas_Object_Text_Item *) eina_inlist_remove(EINA_INLIST_GET(o->items), - EINA_INLIST_GET(o->items)->last); + EINA_INLIST_GET(o->last_computed.ellipsis_end)); } else {