jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a181c32cbe03562c148cf31465317df365f9111d
commit a181c32cbe03562c148cf31465317df365f9111d
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Tue Aug 18 21:35:55 2015 +0900
Edje: Fix IMAGE filters
Some invalid logic made filters work only in a rare situation.
@fix
---
src/lib/edje/edje_calc.c | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 3312007..2da8cb8 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -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->max.limit)
- {
- if ((maxw <= 0) || (w < maxw)) maxw = w;
- if ((maxh <= 0) || (h < maxh)) maxh = 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;
+ }
}
-
_edje_part_recalc_single_filter(ed, ep, desc, chosen_desc, pos);
}
else if (ep->part->type == EDJE_PART_TYPE_PROXY)
--
