diff options
| author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-06-15 13:41:42 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-06-15 13:41:42 -0400 |
| commit | 8ab1d7da3ab6cb1b1530ccb8a7afdaeff6df21e4 (patch) | |
| tree | 7888275b2dda1708210dd3552bca898a1417b099 | |
| parent | fd4226eb8f51d440616e0bffad4ec43521c62815 (diff) | |
| download | enlightenment-8ab1d7da3ab6cb1b1530ccb8a7afdaeff6df21e4.tar.gz | |
add flag to E_Comp_Object for detecting show animation state
this allows improvements to the code which provides hide animations,
allowing clients to begin hiding during their show animations instead
of rendering a black rectangle
| -rw-r--r-- | src/bin/e_comp_object.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 31dc7f6896..99c1ed9945 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -99,6 +99,7 @@ typedef struct _E_Comp_Object unsigned int failures; //number of consecutive e_pixmap_image_draw() failures Eina_Bool delete_pending : 1; // delete pendig Eina_Bool defer_hide : 1; // flag to get hide to work on deferred hide + Eina_Bool showing : 1; // object is currently in "show" animation Eina_Bool visible : 1; // is visible Eina_Bool shaped : 1; // is shaped @@ -676,6 +677,7 @@ _e_comp_object_animating_end(E_Comp_Object *cw) if (!cw->animating) { e_comp->animating--; + cw->showing = 0; UNREFD(cw->ec, 2); /* remove ref from animation start, account for possibility of deletion from unref */ return e_object_unref(E_OBJECT(cw->ec)); @@ -1307,7 +1309,7 @@ _e_comp_intercept_hide(void *data, Evas_Object *obj) return; } /* already hidden or currently animating */ - if ((!cw->visible) || (cw->animating && (!cw->ec->iconic))) return; + if ((!cw->visible) || (cw->animating && (!cw->showing) && (!cw->ec->iconic))) return; /* don't try hiding during shutdown */ cw->defer_hide |= stopping; @@ -1319,7 +1321,7 @@ _e_comp_intercept_hide(void *data, Evas_Object *obj) cw->ec->delete_requested = 0; e_hints_window_hidden_set(cw->ec); } - if ((!cw->animating) || (cw->ec->iconic)) + if ((!cw->animating) || cw->showing || cw->ec->iconic) { if (cw->ec->iconic) e_comp_object_signal_emit(obj, "e,action,iconify", "e"); @@ -2074,10 +2076,12 @@ _e_comp_smart_show(Evas_Object *obj) e_comp_object_effect_params_set(obj, 0, (int[]){1}, 1); e_comp_object_effect_start(obj, _e_comp_object_done_defer, cw); } + cw->showing = 1; } /* ensure some random effect doesn't lock the client offscreen */ if (!cw->animating) { + cw->showing = 0; e_comp_object_effect_set(obj, NULL); e_comp_shape_queue(); } |