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

fix some aspect cacls 

SVN revision: 24480
This commit is contained in:
Carsten Haitzler 2006-08-08 20:25:24 +00:00
parent ad4e90eafd
commit 49e9c9589e
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
legacy/edje/src/lib/edje_calc.c
View File

@ -346,19 +346,29 @@ _edje_part_recalc_single(Edje *ed,
break;
}
}
if (apref == EDJE_ASPECT_PREFER_NONE) /* keep both dimensions in check */
if (apref == EDJE_ASPECT_PREFER_NONE) /* keep botth dimensions in check */
{
/* adjust for min aspect (width / height) */
if ((amin > 0.0) && (aspect < amin))
{
new_h = (params->w / amin);
new_w = (params->h * amin);
}
/* adjust for max aspect (width / height) */
if ((amax > 0.0) && (aspect > amax))
{
new_h = (params->w / amax);
new_w = (params->h * amax);
}
/* adjust for min aspect (width / height) */
if ((amin > 0.0) && (aspect < amin))
if ((amax > 0.0) && (new_w < params->w))
{
new_h = (params->w / amin);
new_w = (params->h * amin);
new_w = params->w;
new_h = params->w / amax;
}
if ((amax > 0.0) && (new_h < params->h))
{
new_w = params->h * amax;
new_h = params->h;
}
} /* prefer vertical size as determiner */
else if (apref == EDJE_ASPECT_PREFER_VERTICAL) /* keep both dimensions in check */
@ -395,12 +405,15 @@ _edje_part_recalc_single(Edje *ed,
}
}
if ((maxw >= 0) && (new_w > maxw)) new_w = maxw;
if (new_w < minw) new_w = minw;
if (!((amin > 0.0) && (amax > 0.0) && (apref == EDJE_ASPECT_PREFER_NONE)))
{
if ((maxw >= 0) && (new_w > maxw)) new_w = maxw;
if (new_w < minw) new_w = minw;
if ((maxh >= 0) && (new_h > maxh)) new_h = maxh;
if (new_h < minh) new_h = minh;
}
if ((maxh >= 0) && (new_h > maxh)) new_h = maxh;
if (new_h < minh) new_h = minh;
/* do real adjustment */
if (apref == EDJE_ASPECT_PREFER_BOTH)
{
@ -439,7 +452,12 @@ _edje_part_recalc_single(Edje *ed,
}
else
{
if ((params->h - new_h) > (params->w - new_w))
if ((amin > 0.0) && (amax > 0.0) && (apref == EDJE_ASPECT_PREFER_NONE))
{
params->w = new_w;
params->h = new_h;
}
else if ((params->h - new_h) > (params->w - new_w))
{
if (params->h < new_h)
params->h = new_h;