summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-12-28 00:58:10 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-12-28 00:58:10 +0000
commitf9ebc7bdcd3239e3f7ed0ced73c6e6a79779901c (patch)
tree899a4ffd0ce70085ff892451b4b1646a97e4ec6a /src
parent7b2b9da7cbd367bddfbb5d999e25b59fa989c726 (diff)
evas: simplify logic for ellipsis.
SVN revision: 81773
Diffstat (limited to 'src')
-rw-r--r--src/lib/evas/canvas/evas_object_text.c10
1 files 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
163 o->cur.style == o->prev.style && 163 o->cur.style == o->prev.style &&
164 obj->cur.scale == obj->prev.scale) 164 obj->cur.scale == obj->prev.scale)
165 { 165 {
166 if (o->last_computed.ellipsis_start && 166 if (o->last_computed.ellipsis_start)
167 o->last_computed.ellipsis_start == o->items)
168 o->items = (Evas_Object_Text_Item *) eina_inlist_remove(EINA_INLIST_GET(o->items), 167 o->items = (Evas_Object_Text_Item *) eina_inlist_remove(EINA_INLIST_GET(o->items),
169 EINA_INLIST_GET(o->items)); 168 EINA_INLIST_GET(o->last_computed.ellipsis_start));
170 if (o->last_computed.ellipsis_end && 169 if (o->last_computed.ellipsis_end)
171 EINA_INLIST_GET(o->last_computed.ellipsis_end) == EINA_INLIST_GET(o->items)->last)
172 o->items = (Evas_Object_Text_Item *) eina_inlist_remove(EINA_INLIST_GET(o->items), 170 o->items = (Evas_Object_Text_Item *) eina_inlist_remove(EINA_INLIST_GET(o->items),
173 EINA_INLIST_GET(o->items)->last); 171 EINA_INLIST_GET(o->last_computed.ellipsis_end));
174 } 172 }
175 else 173 else
176 { 174 {