fix e_box fill/expand.

SVN revision: 36143
This commit is contained in:
Carsten Haitzler 2008-09-21 08:25:53 +00:00
parent 4a16cd4191
commit d13180f665
1 changed files with 4 additions and 4 deletions

View File

@ -532,10 +532,10 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
ww = w;
hh = (h / (Evas_Coord)count);
ow = bi->min.w;
if (bi->expand_w) ow = ww;
if (bi->fill_w) ow = ww;
if ((bi->max.w >= 0) && (bi->max.w < ow)) ow = bi->max.w;
oh = bi->min.h;
if (bi->expand_h) oh = hh;
if (bi->fill_h) oh = hh;
if ((bi->max.h >= 0) && (bi->max.h < oh)) oh = bi->max.h;
evas_object_move(obj,
xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
@ -557,10 +557,10 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
hh += oh;
}
ow = bi->min.w;
if (bi->expand_w) ow = ww;
if (bi->fill_w) ow = ww;
if ((bi->max.w >= 0) && (bi->max.w < ow)) ow = bi->max.w;
oh = bi->min.h;
if (bi->expand_h) oh = hh;
if (bi->fill_h) oh = hh;
if ((bi->max.h >= 0) && (bi->max.h < oh)) oh = bi->max.h;
evas_object_move(obj,
xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),