hugok
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make e_comp_object_effect_stop() return bool for object validity

This commit is contained in:
Mike Blumenkrantz 2015-06-19 16:27:32 -04:00
parent 2a137d4fbe
commit 8f76e14e66
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/e_comp_object.c
View File

@ -3702,11 +3702,11 @@ e_comp_object_effect_start(Evas_Object *obj, Edje_Signal_Cb end_cb, const void *
} }
/* stop a currently-running effect immediately */ /* stop a currently-running effect immediately */
E_API void E_API Eina_Bool
e_comp_object_effect_stop(Evas_Object *obj, Edje_Signal_Cb end_cb) e_comp_object_effect_stop(Evas_Object *obj, Edje_Signal_Cb end_cb)
{ {
API_ENTRY; API_ENTRY EINA_FALSE;
if (evas_object_data_get(cw->effect_obj, "_e_comp.end_cb") != end_cb) return; if (evas_object_data_get(cw->effect_obj, "_e_comp.end_cb") != end_cb) return EINA_TRUE;
e_comp_object_effect_unclip(obj); e_comp_object_effect_unclip(obj);
if (cw->effect_clip) if (cw->effect_clip)
{ {
@ -3715,7 +3715,7 @@ e_comp_object_effect_stop(Evas_Object *obj, Edje_Signal_Cb end_cb)
} }
edje_object_signal_emit(cw->effect_obj, "e,action,stop", "e"); edje_object_signal_emit(cw->effect_obj, "e,action,stop", "e");
edje_object_signal_callback_del_full(cw->effect_obj, "e,action,done", "e", _e_comp_object_effect_end_cb, cw); edje_object_signal_callback_del_full(cw->effect_obj, "e,action,done", "e", _e_comp_object_effect_end_cb, cw);
_e_comp_object_animating_end(cw); return _e_comp_object_animating_end(cw);
} }
static int static int

2
src/bin/e_comp_object.h
View File

@ -79,7 +79,7 @@ E_API void e_comp_object_effect_params_set(Evas_Object *obj, int id, int *params
E_API void e_comp_object_effect_clip(Evas_Object *obj); E_API void e_comp_object_effect_clip(Evas_Object *obj);
E_API void e_comp_object_effect_unclip(Evas_Object *obj); E_API void e_comp_object_effect_unclip(Evas_Object *obj);
E_API Eina_Bool e_comp_object_effect_start(Evas_Object *obj, Edje_Signal_Cb end_cb, const void *end_data); E_API Eina_Bool e_comp_object_effect_start(Evas_Object *obj, Edje_Signal_Cb end_cb, const void *end_data);
E_API void e_comp_object_effect_stop(Evas_Object *obj, Edje_Signal_Cb end_cb); E_API Eina_Bool e_comp_object_effect_stop(Evas_Object *obj, Edje_Signal_Cb end_cb);
E_API E_Comp_Object_Mover *e_comp_object_effect_mover_add(int pri, const char *sig, E_Comp_Object_Mover_Cb provider, const void *data); E_API E_Comp_Object_Mover *e_comp_object_effect_mover_add(int pri, const char *sig, E_Comp_Object_Mover_Cb provider, const void *data);
E_API void e_comp_object_effect_mover_del(E_Comp_Object_Mover *prov); E_API void e_comp_object_effect_mover_del(E_Comp_Object_Mover *prov);