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:
parent
4bae09712d
commit
3125c3a674
|
@ -1153,12 +1153,9 @@ _e_comp_intercept_hide(void *data, Evas_Object *obj)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
e_comp_object_signal_emit(obj, "e,state,hidden", "e");
|
e_comp_object_signal_emit(obj, "e,state,hidden", "e");
|
||||||
if (!cw->animating)
|
cw->comp->animating++;
|
||||||
{
|
cw->animating++;
|
||||||
cw->comp->animating++;
|
e_object_ref(E_OBJECT(cw->ec));
|
||||||
cw->animating = 1;
|
|
||||||
e_object_ref(E_OBJECT(cw->ec));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
cw->defer_hide = !!cw->animating;
|
cw->defer_hide = !!cw->animating;
|
||||||
if (!cw->animating)
|
if (!cw->animating)
|
||||||
|
@ -1835,12 +1832,9 @@ _e_comp_smart_show(Evas_Object *obj)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
e_comp_object_signal_emit(cw->smart_obj, "e,state,visible", "e");
|
e_comp_object_signal_emit(cw->smart_obj, "e,state,visible", "e");
|
||||||
if (!cw->animating)
|
cw->comp->animating++;
|
||||||
{
|
cw->animating++;
|
||||||
cw->comp->animating++;
|
e_object_ref(E_OBJECT(cw->ec));
|
||||||
cw->animating = 1;
|
|
||||||
e_object_ref(E_OBJECT(cw->ec));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (!cw->animating)
|
if (!cw->animating)
|
||||||
e_comp_object_effect_set(obj, NULL);
|
e_comp_object_effect_set(obj, NULL);
|
||||||
|
|
Loading…
Reference in New Issue