From 8e004030470a89e34582ea4f20d9648547b0697f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Thu, 1 Oct 2015 21:58:18 +0900 Subject: [PATCH] edje_cc: Allow PROXY as clipper (clip_to and desc.clip_to) This arbitrary limitation can now be lifted since masking is well supported (ie. clip_to can point to an IMAGE rather than a RECT). @feature --- src/bin/edje/edje_cc_out.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c index d8f6d55..2a31b3f 100644 --- a/src/bin/edje/edje_cc_out.c +++ b/src/bin/edje/edje_cc_out.c @@ -553,7 +553,8 @@ check_state(Edje_Part_Collection *pc, Edje_Part *ep, Edje_Part_Description_Commo /* FIXME: When smart masks are supported, remove this check */ if (ed->clip_to_id != -1 && (pc->parts[ed->clip_to_id]->type != EDJE_PART_TYPE_RECTANGLE) && - (pc->parts[ed->clip_to_id]->type != EDJE_PART_TYPE_IMAGE)) + (pc->parts[ed->clip_to_id]->type != EDJE_PART_TYPE_IMAGE) && + (pc->parts[ed->clip_to_id]->type != EDJE_PART_TYPE_PROXY)) error_and_abort(ef, "Collection %i: part: '%s' state: '%s' %g clip_to points to " "a non RECT/IMAGE part '%s'!", pc->id, ep->name, ed->state.name, ed->state.value, @@ -600,7 +601,8 @@ check_part(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef) /* FIXME: When smart masks are supported, remove this check */ if (ep->clip_to_id != -1 && (pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_RECTANGLE) && - (pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_IMAGE)) + (pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_IMAGE) && + (pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_PROXY)) error_and_abort(ef, "Collection %i: clip_to point to a non RECT/IMAGE part '%s' !", pc->id, pc->parts[ep->clip_to_id]->name); } -- 2.7.4