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

edje_cc must error when first provided state description is not "default" 0.0 

correctly @fix T1926 without breaking existing apps/syntax
This commit is contained in:
Mike Blumenkrantz 2015-01-26 15:02:51 -05:00
parent a5217c7c53
commit ae16cb648a
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/bin/edje/edje_cc_handlers.c
View File

@ -6469,14 +6469,12 @@ st_collections_group_parts_part_description_state(void)
Edje_Part *ep;
Edje_Part_Description_Common *ed;
char *s;
double val;
check_min_arg_count(1);
ep = current_part;
ed = ep->default_desc;
if (ep->other.desc_count) ed = ep->other.desc[ep->other.desc_count - 1];
s = parse_str(0);
if (!strcmp (s, "custom"))
{
@ -6484,13 +6482,25 @@ st_collections_group_parts_part_description_state(void)
file_in, line - 1, s);
exit(-1);
}
if (get_arg_count() == 1)
val = 0.0;
else
val = parse_float_range(1, 0.0, 1.0);
/* if only default desc exists and current desc is not default, commence paddling */
if ((!ep->other.desc_count) && (val || (!eina_streq(s, "default"))))
{
ERR("parse error %s:%i. invalid state name: '%s'. \"default\" state must always be first.",
file_in, line - 1, s);
exit(-1);
}
ed = ep->default_desc;
if (ep->other.desc_count) ed = ep->other.desc[ep->other.desc_count - 1];
free((void *)ed->state.name);
ed->state.name = s;
if (get_arg_count() == 1)
ed->state.value = 0.0;
else
ed->state.value = parse_float_range(1, 0.0, 1.0);
ed->state.value = val;
_part_description_state_update(ed);
}