fix more misuses of comp animating flag

this should even things out permanently here and ensure things get deleted when they should

related: T879
This commit is contained in:
Mike Blumenkrantz 2014-01-30 12:09:43 -05:00
parent 4bae09712d
commit 3125c3a674
1 changed files with 6 additions and 12 deletions

View File

@ -1153,12 +1153,9 @@ _e_comp_intercept_hide(void *data, Evas_Object *obj)
else
{
e_comp_object_signal_emit(obj, "e,state,hidden", "e");
if (!cw->animating)
{
cw->comp->animating++;
cw->animating = 1;
e_object_ref(E_OBJECT(cw->ec));
}
cw->comp->animating++;
cw->animating++;
e_object_ref(E_OBJECT(cw->ec));
}
cw->defer_hide = !!cw->animating;
if (!cw->animating)
@ -1835,12 +1832,9 @@ _e_comp_smart_show(Evas_Object *obj)
else
{
e_comp_object_signal_emit(cw->smart_obj, "e,state,visible", "e");
if (!cw->animating)
{
cw->comp->animating++;
cw->animating = 1;
e_object_ref(E_OBJECT(cw->ec));
}
cw->comp->animating++;
cw->animating++;
e_object_ref(E_OBJECT(cw->ec));
}
if (!cw->animating)
e_comp_object_effect_set(obj, NULL);