kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix max value calculation of els_box. Related to svn 82450. 

SVN revision: 82504
This commit is contained in:
Jaehwan Kim 2013-01-10 04:41:36 +00:00
parent 1a77d92c46
commit ae782f4d81
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
legacy/elementary/src/lib/els_box.c
View File

@ -73,10 +73,12 @@ _smart_extents_calculate(Evas_Object *box, Evas_Object_Box_Data *priv, int horiz
maxw = -1;
max = EINA_FALSE;
}
if (max)
if (max) maxw += mnw;
if (mnh >= 0)
{
if (maxh > mnh) maxh = mnh;
maxw += mnw;
if (maxh == -1) maxh = mnh;
else if (maxh > mnh) maxh = mnh;
}
}
else
@ -86,10 +88,12 @@ _smart_extents_calculate(Evas_Object *box, Evas_Object_Box_Data *priv, int horiz
maxh = -1;
max = EINA_FALSE;
}
if (max)
if (max) maxh += mnh;
if (mnw >= 0)
{
if (maxw > mnw) maxw = mnw;
maxh += mnh;
if (maxw == -1) maxw = mnw;
else if (maxw > mnw) maxw = mnw;
}
}
}