diff options
| author | Hyungdeuk Kim <hd3.kim@samsung.com> | 2013-08-19 15:09:03 +0900 |
|---|---|---|
| committer | Hyungdeuk Kim <hd3.kim@samsung.com> | 2013-08-19 15:11:25 +0900 |
| commit | 4a1e153397f33d71a8e3178a9c88205f99b0193e (patch) | |
| tree | d5f0507e1bd96e3fbd79e29debc0c597c9160ef1 /ug-efl-engine/ug-efl-engine.c | |
| parent | c263cfb5be4194ab0e3600337180ba90df1e67f9 (diff) | |
| download | ui-gadget-1-4a1e153397f33d71a8e3178a9c88205f99b0193e.tar.gz ui-gadget-1-4a1e153397f33d71a8e3178a9c88205f99b0193e.tar.bz2 ui-gadget-1-4a1e153397f33d71a8e3178a9c88205f99b0193e.zip | |
merge latest code / fix prevent issues
Change-Id: I644d827593a43cc5308150bbd7546557a1ea27bb
Diffstat (limited to 'ug-efl-engine/ug-efl-engine.c')
| -rwxr-xr-x | ug-efl-engine/ug-efl-engine.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/ug-efl-engine/ug-efl-engine.c b/ug-efl-engine/ug-efl-engine.c index 0721c4b..88ff163 100755 --- a/ug-efl-engine/ug-efl-engine.c +++ b/ug-efl-engine/ug-efl-engine.c @@ -36,7 +36,7 @@ static Evas_Object *conform = NULL; static void on_show_cb(void *data, Evas *e, Evas_Object *obj, void *event_info); static void (*show_end_cb)(void* data) = NULL; static void (*hide_end_cb)(void* data) = NULL; - +static void __show_finished(void *data, Evas_Object *obj, void *event_info); static Evas_Object *_get_win_conformant(Evas_Object *win) { @@ -239,9 +239,12 @@ static void on_destroy(ui_gadget_h ug, ui_gadget_h t_ug, if(ug->layout_state == UG_LAYOUT_SHOW) { __del_effect_top_layout(ug); + } else if (ug->layout_state == UG_LAYOUT_SHOWEFFECT) { + evas_object_smart_callback_del(navi, "transition,finished", + __show_finished); + __del_effect_top_layout(ug); } else if (ug->layout_state == UG_LAYOUT_HIDE - || ug->layout_state == UG_LAYOUT_NOEFFECT - || ug->layout_state == UG_LAYOUT_SHOWEFFECT) { + || ug->layout_state == UG_LAYOUT_NOEFFECT) { __del_effect_layout(ug, t_ug); } else if (ug->layout_state == UG_LAYOUT_HIDEEFFECT) { ; @@ -330,9 +333,10 @@ static void *on_create(void *win, ui_gadget_h ug, if (con) { conform = con; _DBG("\t There is conformant"); + } else { + _ERR("\t There is no conformant"); + return NULL; } - else - _DBG("\t There is NO conformant"); if (!navi) { navi = elm_naviframe_add(conform); |