cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3b93896e54d82b451919484100d0cb830e759536
commit 3b93896e54d82b451919484100d0cb830e759536
Author: Cedric Bail <cedric.b...@samsung.com>
Date: Wed Oct 2 11:02:05 2013 +0900
evas: fix Evas_Object_Text alignment with ellipsis.
---
src/lib/evas/canvas/evas_object_text.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_text.c
b/src/lib/evas/canvas/evas_object_text.c
index 29057d2..7e9a081 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -2475,19 +2475,29 @@ _evas_object_text_recalc(Evas_Object *eo_obj,
Eina_Unicode *text)
if ((o->font) && (o->items))
{
- int w, h;
- int l = 0, r = 0, t = 0, b = 0;
+ int h;
+ int l = 0, r = 0, t = 0, b = 0;
- w = _evas_object_text_horiz_advance_get(eo_obj, o);
h = _evas_object_text_vert_advance_get(eo_obj, o);
- evas_text_style_pad_get(o->cur.style, &l, &r, &t, &b);
+ evas_text_style_pad_get(o->cur.style, &l, &r, &t, &b);
if (o->cur.ellipsis >= 0.0)
- eo_do_super(eo_obj, MY_CLASS,
- evas_obj_size_set(obj->cur->geometry.w, h + t + b));
+ {
+ int min;
+
+ min = o->last_computed.advance < obj->cur->geometry.w ?
o->last_computed.advance : obj->cur->geometry.w;
+ eo_do_super(eo_obj, MY_CLASS,
+ evas_obj_size_set(min, h + t + b));
+ }
else
- eo_do_super(eo_obj, MY_CLASS,
- evas_obj_size_set(w + l + r, h + t + b));
+ {
+ int w;
+
+ w = _evas_object_text_horiz_advance_get(eo_obj, o);
+
+ eo_do_super(eo_obj, MY_CLASS,
+ evas_obj_size_set(w + l + r, h + t + b));
+ }
//// obj->cur->cache.geometry.validity = 0;
}
else
--
