summaryrefslogtreecommitdiff
path: root/src/bin/edje/edje_cc_out.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-10-01 21:58:18 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-10-01 22:08:46 +0900
commit8e004030470a89e34582ea4f20d9648547b0697f (patch)
treea64ac40ac8d4c9c0ce1b14e7a01ce7a5051e222b /src/bin/edje/edje_cc_out.c
parentba5d3b048090e7a2a7dea648eb2dd3ea7ab2d3ae (diff)
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
Diffstat (limited to '')
-rw-r--r--src/bin/edje/edje_cc_out.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index d8f6d55e75..2a31b3f422 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
553 /* FIXME: When smart masks are supported, remove this check */ 553 /* FIXME: When smart masks are supported, remove this check */
554 if (ed->clip_to_id != -1 && 554 if (ed->clip_to_id != -1 &&
555 (pc->parts[ed->clip_to_id]->type != EDJE_PART_TYPE_RECTANGLE) && 555 (pc->parts[ed->clip_to_id]->type != EDJE_PART_TYPE_RECTANGLE) &&
556 (pc->parts[ed->clip_to_id]->type != EDJE_PART_TYPE_IMAGE)) 556 (pc->parts[ed->clip_to_id]->type != EDJE_PART_TYPE_IMAGE) &&
557 (pc->parts[ed->clip_to_id]->type != EDJE_PART_TYPE_PROXY))
557 error_and_abort(ef, "Collection %i: part: '%s' state: '%s' %g clip_to points to " 558 error_and_abort(ef, "Collection %i: part: '%s' state: '%s' %g clip_to points to "
558 "a non RECT/IMAGE part '%s'!", 559 "a non RECT/IMAGE part '%s'!",
559 pc->id, ep->name, ed->state.name, ed->state.value, 560 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)
600 /* FIXME: When smart masks are supported, remove this check */ 601 /* FIXME: When smart masks are supported, remove this check */
601 if (ep->clip_to_id != -1 && 602 if (ep->clip_to_id != -1 &&
602 (pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_RECTANGLE) && 603 (pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_RECTANGLE) &&
603 (pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_IMAGE)) 604 (pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_IMAGE) &&
605 (pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_PROXY))
604 error_and_abort(ef, "Collection %i: clip_to point to a non RECT/IMAGE part '%s' !", 606 error_and_abort(ef, "Collection %i: clip_to point to a non RECT/IMAGE part '%s' !",
605 pc->id, pc->parts[ep->clip_to_id]->name); 607 pc->id, pc->parts[ep->clip_to_id]->name);
606} 608}