jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove uselss if block. The same calculation was being done in both parts of 

the if.
Fix some formatting issues.


SVN revision: 33686
This commit is contained in:
Christopher Michael 2008-02-06 02:14:04 +00:00
parent 44191ab9cf
commit 8e521eb303
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/bin/e_box.c
View File

@ -485,10 +485,12 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
hh = h;
ow = bi->min.w;
if (bi->fill_w) ow = ww;
if ((bi->max.w >= 0) && (bi->max.w < ow)) ow = bi->max.w;
if ((bi->max.w >= 0) && (bi->max.w < ow))
ow = bi->max.w;
oh = bi->min.h;
if (bi->fill_h) oh = hh;
if ((bi->max.h >= 0) && (bi->max.h < oh)) oh = bi->max.h;
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),
yy + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
@ -595,26 +597,14 @@ _e_box_smart_extents_calculate(E_Smart_Data *sd)
bi = evas_object_data_get(obj, "e_box_data");
if (bi)
{
if (sd->horizontal)
{
if (minh < bi->min.h) minh = bi->min.h;
if (minw < bi->min.w) minw = bi->min.w;
}
else
{
if (minw < bi->min.w) minw = bi->min.w;
if (minh < bi->min.h) minh = bi->min.h;
}
if (minh < bi->min.h) minh = bi->min.h;
if (minw < bi->min.w) minw = bi->min.w;
}
}
if (sd->horizontal)
{
minw *= evas_list_count(sd->items);
}
minw *= evas_list_count(sd->items);
else
{
minh *= evas_list_count(sd->items);
}
minh *= evas_list_count(sd->items);
}
else
{