From de0b9edee0309411cf02fc4280885214b7ec69e4 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 1 May 2017 13:26:03 -0400 Subject: [PATCH] better handling for iconify during comp object show/hide in the case where effects are disabled, no animation is started for iconify operations, so this should fall through to the normal hide/show paths ref T5444 --- src/bin/e_comp_object.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 6577b7c4e..10d82e095 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -1649,7 +1649,7 @@ _e_comp_intercept_hide(void *data, Evas_Object *obj) { if (cw->ec->iconic) e_comp_object_signal_emit(obj, "e,action,iconify", "e"); - else + if ((!cw->ec->iconic) || (cw->ec->iconic && (!cw->animating))) { e_comp_object_signal_emit(obj, "e,state,hidden", "e"); if (!cw->showing) @@ -2395,8 +2395,9 @@ _e_comp_smart_show(Evas_Object *obj) } if (cw->ec->iconic && (!cw->ec->new_client)) e_comp_object_signal_emit(cw->smart_obj, "e,action,uniconify", "e"); - else if (!cw->showing) /* if set, client was ec->hidden during show animation */ + if ((!cw->showing) && ((!cw->ec->iconic) || cw->ec->new_client || (!cw->animating))) { + /* if cw->showing set, client was ec->hidden during show animation */ e_comp_object_signal_emit(cw->smart_obj, "e,state,visible", "e"); _e_comp_object_animating_begin(cw); cw->showing = 1;