enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

Fix edje calculation of max width for swallowed parts. 

If you have a SWALLOW part taking the whole window and then swallow an
object with max set using edje_extern_object_max_size_set() it will
not take effect due the comparison of ep->swallow_params.max.w < -1
(desc->max.w is -1 in this case).


SVN revision: 32029
This commit is contained in:
Gustavo Sverzut Barbieri 2007-10-09 15:30:26 +00:00
parent 4a3ce0ebe0
commit 403afe21fc
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,16 +260,18 @@ _edje_part_recalc_single(Edje *ed,
minw = desc->min.w;
if (ep->swallow_params.min.w > desc->min.w) minw = ep->swallow_params.min.w;
maxw = desc->max.w;
if ((ep->swallow_params.max.w >= 0) &&
(ep->swallow_params.max.w < maxw)) maxw = ep->swallow_params.max.w;
if (((ep->swallow_params.max.w >= 0) && (desc->max.w >= 0) &&
(ep->swallow_params.max.w < maxw)) ||
(ep->swallow_params.max.w >= 0)) maxw = ep->swallow_params.max.w;
}
// if (flags & FLAG_Y)
{
minh = desc->min.h;
if (ep->swallow_params.min.h > desc->min.h) minh = ep->swallow_params.min.h;
maxh = desc->max.h;
if ((ep->swallow_params.max.h >= 0) &&
(ep->swallow_params.max.h < maxh)) maxh = ep->swallow_params.max.h;
if (((ep->swallow_params.max.h >= 0) && (desc->max.h >= 0) &&
(ep->swallow_params.max.h < maxh)) ||
(ep->swallow_params.max.h >= 0)) maxh = ep->swallow_params.max.h;
}
/* relative coords of top left & bottom right */
if (flags & FLAG_X)