From 97600782de40a31d77297c8adf0b7ac51705dcd3 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 30 Mar 2011 12:26:07 +0000 Subject: [PATCH] verified. can remove the format forcing. SVN revision: 58211 --- legacy/evas/src/lib/canvas/evas_object_textblock.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index 890f94f24c..0843f4bc3c 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -3704,7 +3704,7 @@ _layout(const Evas_Object *obj, int calc_only, int w, int h, int *w_ret, int *h_ /* Is this really the place? */ /* Vertically align the textblock */ - if (o->content_changed) + if ((o->valign > 0.0) && (c->h > c->hmax)) { if ((o->valign > 0.0) && (c->h > c->hmax)) { @@ -8664,7 +8664,6 @@ evas_object_textblock_render_pre(Evas_Object *obj) (obj->cur.geometry.h != o->last_h)))) { o->formatted.valid = 0; - if ((o->valign != 0.0) || (o->have_ellipsis)) o->content_changed = 1; _layout(obj, 0, obj->cur.geometry.w, obj->cur.geometry.h, @@ -8822,7 +8821,6 @@ evas_object_textblock_coords_recalc(Evas_Object *obj) (((o->valign != 0.0) || (o->have_ellipsis)) && (obj->cur.geometry.h != o->last_h))) { - if ((o->valign != 0.0) || (o->have_ellipsis)) o->content_changed = 1; o->formatted.valid = 0; o->changed = 1; }