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

Edje: Fix IMAGE filters 

Some invalid logic made filters work only in a rare situation.

@fix
This commit is contained in:
Jean-Philippe Andre 2015-08-18 21:35:55 +09:00
parent 31edfbb817
commit a181c32cbe
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/lib/edje/edje_calc.c
View File

@ -2834,29 +2834,30 @@ _edje_part_recalc_single(Edje *ed,
if (lminh > minh) minh = lminh;
}
}
else if ((ep->part->type == EDJE_PART_TYPE_IMAGE) &&
(chosen_desc->min.limit || chosen_desc->max.limit))
else if (ep->part->type == EDJE_PART_TYPE_IMAGE)
{
Evas_Coord w, h;
if (chosen_desc->min.limit || chosen_desc->max.limit)
{
Evas_Coord w, h;
/* We only need pos to find the right image that would be displayed */
/* Yes, if someone set aspect preference to SOURCE and also max,min
/* We only need pos to find the right image that would be displayed */
/* Yes, if someone set aspect preference to SOURCE and also max,min
to SOURCE, it will be under efficient, but who cares at the
moment. */
_edje_real_part_image_set(ed, ep, NULL, pos);
evas_object_image_size_get(ep->object, &w, &h);
_edje_real_part_image_set(ed, ep, NULL, pos);
evas_object_image_size_get(ep->object, &w, &h);
if (chosen_desc->min.limit)
{
if (w > minw) minw = w;
if (h > minh) minh = h;
if (chosen_desc->min.limit)
{
if (w > minw) minw = w;
if (h > minh) minh = h;
}
if (chosen_desc->max.limit)
{
if ((maxw <= 0) || (w < maxw)) maxw = w;
if ((maxh <= 0) || (h < maxh)) maxh = h;
}
}
if (chosen_desc->max.limit)
{
if ((maxw <= 0) || (w < maxw)) maxw = w;
if ((maxh <= 0) || (h < maxh)) maxh = h;
}
_edje_part_recalc_single_filter(ed, ep, desc, chosen_desc, pos);
}
else if (ep->part->type == EDJE_PART_TYPE_PROXY)