Fix Logically dead code

SVN revision: 82450
This commit is contained in:
Jaehwan Kim 2013-01-09 10:32:52 +00:00
parent ecd584e094
commit fbd2af0ca1
1 changed files with 15 additions and 6 deletions

View File

@ -8,6 +8,7 @@ _smart_extents_calculate(Evas_Object *box, Evas_Object_Box_Data *priv, int horiz
Evas_Coord minw, minh, mnw, mnh, maxw, maxh; Evas_Coord minw, minh, mnw, mnh, maxw, maxh;
const Eina_List *l; const Eina_List *l;
Evas_Object_Box_Option *opt; Evas_Object_Box_Option *opt;
Eina_Bool max = EINA_TRUE;
int c; int c;
minw = 0; minw = 0;
@ -67,19 +68,27 @@ _smart_extents_calculate(Evas_Object *box, Evas_Object_Box_Data *priv, int horiz
evas_object_size_hint_max_get(opt->obj, &mnw, &mnh); evas_object_size_hint_max_get(opt->obj, &mnw, &mnh);
if (horizontal) if (horizontal)
{ {
if (mnw < 0) maxw = -1; if (mnw < 0)
if (maxw != -1)
{ {
if (maxw > mnw) maxw = mnw; maxw = -1;
max = EINA_FALSE;
}
if (max)
{
if (maxh > mnh) maxh = mnh;
maxw += mnw; maxw += mnw;
} }
} }
else else
{ {
if (mnh < 0) maxh = -1; if (mnh < 0)
if (maxh != -1)
{ {
if (maxh > mnh) maxh = mnh; maxh = -1;
max = EINA_FALSE;
}
if (max)
{
if (maxw > mnw) maxw = mnw;
maxh += mnh; maxh += mnh;
} }
} }