enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

Evas textblock: Removed duplicated condition. 

raster: don't drink and code :).

SVN revision: 58212
This commit is contained in:
Tom Hacohen 2011-03-30 12:58:09 +00:00
parent 97600782de
commit e9327efd98
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
legacy/evas/src/lib/canvas/evas_object_textblock.c
View File

@ -3704,8 +3704,6 @@ _layout(const Evas_Object *obj, int calc_only, int w, int h, int *w_ret, int *h_
/* Is this really the place? */ /* Is this really the place? */
/* Vertically align the textblock */ /* Vertically align the textblock */
if ((o->valign > 0.0) && (c->h > c->hmax))
{
if ((o->valign > 0.0) && (c->h > c->hmax)) if ((o->valign > 0.0) && (c->h > c->hmax))
{ {
Evas_Coord adjustment = (c->h - c->hmax) * o->valign; Evas_Coord adjustment = (c->h - c->hmax) * o->valign;
@ -3715,7 +3713,6 @@ _layout(const Evas_Object *obj, int calc_only, int w, int h, int *w_ret, int *h_
par->y += adjustment; par->y += adjustment;
} }
} }
}
if ((o->style_pad.l != style_pad_l) || (o->style_pad.r != style_pad_r) || if ((o->style_pad.l != style_pad_l) || (o->style_pad.r != style_pad_r) ||
(o->style_pad.t != style_pad_t) || (o->style_pad.b != style_pad_b)) (o->style_pad.t != style_pad_t) || (o->style_pad.b != style_pad_b))