enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

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
This commit is contained in:
Mike Blumenkrantz 2015-06-15 13:41:42 -04:00
parent fd4226eb8f
commit 8ab1d7da3a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/e_comp_object.c
View File

@ -99,6 +99,7 @@ typedef struct _E_Comp_Object
unsigned int failures; //number of consecutive e_pixmap_image_draw() failures unsigned int failures; //number of consecutive e_pixmap_image_draw() failures
Eina_Bool delete_pending : 1; // delete pendig Eina_Bool delete_pending : 1; // delete pendig
Eina_Bool defer_hide : 1; // flag to get hide to work on deferred hide 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 visible : 1; // is visible
Eina_Bool shaped : 1; // is shaped Eina_Bool shaped : 1; // is shaped
@ -676,6 +677,7 @@ _e_comp_object_animating_end(E_Comp_Object *cw)
if (!cw->animating) if (!cw->animating)
{ {
e_comp->animating--; e_comp->animating--;
cw->showing = 0;
UNREFD(cw->ec, 2); UNREFD(cw->ec, 2);
/* remove ref from animation start, account for possibility of deletion from unref */ /* remove ref from animation start, account for possibility of deletion from unref */
return e_object_unref(E_OBJECT(cw->ec)); return e_object_unref(E_OBJECT(cw->ec));
@ -1307,7 +1309,7 @@ _e_comp_intercept_hide(void *data, Evas_Object *obj)
return; return;
} }
/* already hidden or currently animating */ /* 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 */ /* don't try hiding during shutdown */
cw->defer_hide |= stopping; cw->defer_hide |= stopping;
@ -1319,7 +1321,7 @@ _e_comp_intercept_hide(void *data, Evas_Object *obj)
cw->ec->delete_requested = 0; cw->ec->delete_requested = 0;
e_hints_window_hidden_set(cw->ec); 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) if (cw->ec->iconic)
e_comp_object_signal_emit(obj, "e,action,iconify", "e"); 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_params_set(obj, 0, (int[]){1}, 1);
e_comp_object_effect_start(obj, _e_comp_object_done_defer, cw); 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 */ /* ensure some random effect doesn't lock the client offscreen */
if (!cw->animating) if (!cw->animating)
{ {
cw->showing = 0;
e_comp_object_effect_set(obj, NULL); e_comp_object_effect_set(obj, NULL);
e_comp_shape_queue(); e_comp_shape_queue();
} }