forked from enlightenment/efl
parent
39273c12e1
commit
91ee528629
|
@ -616,7 +616,9 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep)
|
|||
chosen_desc = ep->param1.description;
|
||||
else
|
||||
chosen_desc = ep->param2.description;
|
||||
|
||||
if (!chosen_desc) chosen_desc = ep->param2.description;
|
||||
if (!chosen_desc) return;
|
||||
|
||||
ep->chosen_description = chosen_desc;
|
||||
if (ep->param1.description)
|
||||
_edje_part_recalc_single(ed, ep, ep->param1.description, chosen_desc, ep->param1.rel1_to_x, ep->param1.rel1_to_y, ep->param1.rel2_to_x, ep->param1.rel2_to_y, ep->confine_to, &p1);
|
||||
|
|
|
@ -577,8 +577,10 @@ _edje_program_run(Edje *ed, Edje_Program *pr, int force)
|
|||
_edje_emit(ed, "program,stop", pr->name);
|
||||
if (_edje_block_break(ed)) goto break_prog;
|
||||
}
|
||||
if (!((pr->action == EDJE_ACTION_TYPE_STATE_SET) &&
|
||||
(pr->tween.time > 0.0) && (!ed->no_anim)))
|
||||
if (!((pr->action == EDJE_ACTION_TYPE_STATE_SET)
|
||||
/* hmm this fucks somethgin up. must look into it later */
|
||||
/* && (pr->tween.time > 0.0) && (!ed->no_anim))) */
|
||||
))
|
||||
{
|
||||
if (pr->after >= 0)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue