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:28:32 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-10-01 21:45:32 +0900
commitad268c1d94b0dd54ce31cb665f0be4c2ed8b4452 (patch)
treeafa8a1bc406ed76aab79958b93defeea29fc18d8 /src/bin/edje/edje_cc_out.c
parent4de199b7ac9dc3d90ee6cfc661f0e105f8d775bb (diff)
edje_cc: Check default state as well
Strangely only the other states were checked for errors. Errors include: - no name for state, or "description with missing state" - invalid clip_to Also improve the error message a bit
Diffstat (limited to '')
-rw-r--r--src/bin/edje/edje_cc_out.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index 5c79ee8298..d8f6d55e75 100644
--- a/src/bin/edje/edje_cc_out.c
+++ b/src/bin/edje/edje_cc_out.c
@@ -554,8 +554,10 @@ check_state(Edje_Part_Collection *pc, Edje_Part *ep, Edje_Part_Description_Commo
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 error_and_abort(ef, "Collection %i: description.clip_to point to a non RECT/IMAGE part '%s' !", 557 error_and_abort(ef, "Collection %i: part: '%s' state: '%s' %g clip_to points to "
558 pc->id, pc->parts[ed->clip_to_id]->name); 558 "a non RECT/IMAGE part '%s'!",
559 pc->id, ep->name, ed->state.name, ed->state.value,
560 pc->parts[ed->clip_to_id]->name);
559 561
560 check_nameless_state(pc, ep, ed, ef); 562 check_nameless_state(pc, ep, ed, ef);
561} 563}
@@ -570,6 +572,7 @@ check_part(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef)
570 error_and_abort(ef, "Collection %i: default description missing " 572 error_and_abort(ef, "Collection %i: default description missing "
571 "for part \"%s\"", pc->id, ep->name); 573 "for part \"%s\"", pc->id, ep->name);
572 574
575 check_state(pc, ep, ep->default_desc, ef);
573 for (i = 0; i < ep->other.desc_count; ++i) 576 for (i = 0; i < ep->other.desc_count; ++i)
574 check_state(pc, ep, ep->other.desc[i], ef); 577 check_state(pc, ep, ep->other.desc[i], ef);
575 578