edje: prevent filter from matching during a program run.
SVN revision: 67495
This commit is contained in:
parent
93a7b884a9
commit
814d9bfb29
|
@ -299,3 +299,7 @@
|
||||||
2012-01-23 Cedric Bail
|
2012-01-23 Cedric Bail
|
||||||
|
|
||||||
* Fix overridding group in edje_cc by fixing with the right index.
|
* Fix overridding group in edje_cc by fixing with the right index.
|
||||||
|
|
||||||
|
2012-01-24 Cedric Bail
|
||||||
|
|
||||||
|
* Filter should only be valid once all program affecting there part are done.
|
||||||
|
|
|
@ -564,7 +564,7 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, const char *d1, doubl
|
||||||
|
|
||||||
_edje_real_part_rel_to_apply(ed, ep, ep->param2);
|
_edje_real_part_rel_to_apply(ed, ep, ep->param2);
|
||||||
|
|
||||||
if (ep->description_pos != 0.0)
|
if (ep->description_pos > FROM_DOUBLE(0.0))
|
||||||
ep->chosen_description = epd2;
|
ep->chosen_description = epd2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1170,8 +1170,13 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src,
|
||||||
|
|
||||||
rp = _edje_real_part_get(ed, pr->filter.part ? pr->filter.part : src);
|
rp = _edje_real_part_get(ed, pr->filter.part ? pr->filter.part : src);
|
||||||
if (rp)
|
if (rp)
|
||||||
|
{
|
||||||
|
if (rp->program)
|
||||||
|
exec = EINA_FALSE;
|
||||||
|
else
|
||||||
exec = (rp->chosen_description->state.name == pr->filter.state);
|
exec = (rp->chosen_description->state.name == pr->filter.state);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (exec)
|
if (exec)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue