projects
/
platform
/
upstream
/
enlightenment.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
898c843
)
e_comp_object: Add codes to check whether effect is running or not
83/66383/3
author
Seungjin Park
<sj8808.park@samsung.com>
Mon, 18 Apr 2016 13:10:55 +0000
(22:10 +0900)
committer
Gwanglim Lee
<gl77.lee@samsung.com>
Tue, 26 Apr 2016 02:59:41 +0000
(19:59 -0700)
Change-Id: I941a62231f6bfe59f1e66c25893843a1beb8789b
src/bin/e_comp_object.c
patch
|
blob
|
history
diff --git
a/src/bin/e_comp_object.c
b/src/bin/e_comp_object.c
index fbf7754725e76a8c95417740ce36bb455828b9c1..6a859c5da5246d9752848d4f8b72b776b6a5d5ab 100644
(file)
--- a/
src/bin/e_comp_object.c
+++ b/
src/bin/e_comp_object.c
@@
-4059,6
+4059,12
@@
e_comp_object_effect_start(Evas_Object *obj, Edje_Signal_Cb end_cb, const void *
API_ENTRY EINA_FALSE;
EINA_SAFETY_ON_NULL_RETURN_VAL(cw->ec, EINA_FALSE); //NYI
if (!cw->effect_set) return EINA_FALSE;
+
+ if (cw->effect_running)
+ {
+ e_comp_object_effect_stop(obj, evas_object_data_get(cw->effect_obj, "_e_comp.end_cb"));
+ }
+
e_comp_object_effect_clip(obj);
edje_object_signal_callback_del(cw->effect_obj, "e,action,done", "e", _e_comp_object_effect_end_cb);