rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=4ffdd2d97c184b6f64d4bcfaf7e3eb24f039fcf3
commit 4ffdd2d97c184b6f64d4bcfaf7e3eb24f039fcf3 Author: Vyacheslav Reutskiy <[email protected]> Date: Fri May 13 14:20:00 2016 +0300 modal_window: update the mw_add signature Move out callback and data from API. We must to add it like another callbaks, use the evas_object_smart_callback_add Change-Id: I52cb83ea89031f45e22200d63b99159c1b026f25 --- src/bin/ui/colorclass_manager.c | 2 +- src/bin/ui/image_manager.c | 2 +- src/bin/ui/modal_window/modal_window.c | 20 +++----------------- src/bin/ui/modal_window/modal_window.h | 4 +--- src/bin/ui/sound_manager.c | 2 +- src/bin/ui/style_manager.c | 2 +- 6 files changed, 8 insertions(+), 24 deletions(-) diff --git a/src/bin/ui/colorclass_manager.c b/src/bin/ui/colorclass_manager.c index 371afc8..388c18c 100644 --- a/src/bin/ui/colorclass_manager.c +++ b/src/bin/ui/colorclass_manager.c @@ -370,7 +370,7 @@ _colorclass_main_layout_create(Colorclasses_Manager *edit) } /* Creating main layout of window */ - edit->win = mw_add(NULL, NULL); + edit->win = mw_add(); mw_title_set(edit->win, _("Color class manager")); ic = elm_icon_add(edit->win); elm_icon_standard_set(ic, "color"); diff --git a/src/bin/ui/image_manager.c b/src/bin/ui/image_manager.c index 8fea084..1e63037 100644 --- a/src/bin/ui/image_manager.c +++ b/src/bin/ui/image_manager.c @@ -492,7 +492,7 @@ image_manager_add() Image_Manager *img_mng = (Image_Manager *)mem_calloc(1, sizeof(Image_Manager)); - img_mng->win = mw_add(NULL, NULL); + img_mng->win = mw_add(); mw_title_set(img_mng->win, _("Image manager")); ic = elm_icon_add(img_mng->win); elm_icon_standard_set(ic, "image2"); diff --git a/src/bin/ui/modal_window/modal_window.c b/src/bin/ui/modal_window/modal_window.c index fbca71b..e1d3e17 100644 --- a/src/bin/ui/modal_window/modal_window.c +++ b/src/bin/ui/modal_window/modal_window.c @@ -20,9 +20,6 @@ #include "modal_window.h" #include "widget_macro.h" -#define FUNC_CLOSE "func_close" -#define FUNC_DATA "func_data" - static void _response_cb(void *data, Evas_Object *obj __UNUSED__, @@ -148,19 +145,11 @@ _mw_close(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - Evas_Smart_Cb func; - void *func_data; - Evas_Object *mw; - - mw = (Evas_Object *)data; + Evas_Object *mw = data; assert(mw != NULL); - func_data = evas_object_data_get(mw, FUNC_DATA); - func = evas_object_data_get(mw, FUNC_CLOSE); - if (func) func(func_data, mw, NULL); - else _anim_hide(elm_object_parent_widget_get(mw), - evas_object_evas_get(mw), mw, NULL); + _anim_hide(elm_object_parent_widget_get(mw), evas_object_evas_get(mw), mw, NULL); } void @@ -173,7 +162,7 @@ mw_del(Evas_Object *mw) } Evas_Object * -mw_add(Evas_Smart_Cb func, void *data) +mw_add(void) { Evas_Object *mw, *btn; @@ -187,9 +176,6 @@ mw_add(Evas_Smart_Cb func, void *data) evas_object_smart_callback_add(btn, "clicked", _mw_close, mw); elm_object_part_content_set(mw, "elm.swallow.close", btn); - evas_object_data_set(mw, FUNC_CLOSE, func); - evas_object_data_set(mw, FUNC_DATA, data); - evas_object_event_callback_add(mw, EVAS_CALLBACK_SHOW, _anim_show, ap.win); return mw; diff --git a/src/bin/ui/modal_window/modal_window.h b/src/bin/ui/modal_window/modal_window.h index 6f2ce28..cb4a5c7 100644 --- a/src/bin/ui/modal_window/modal_window.h +++ b/src/bin/ui/modal_window/modal_window.h @@ -41,8 +41,6 @@ * with anything other than the top-most window as its parameter, unless you are * fond of undefined behavior. * - * @param func Inwin on_close callback. - * @param data Additional data that will be passed to callback. * @return The new modal window or NULL if it cannot be created. * * @note Do not use evas_object_del for this object if you want to play hide @@ -51,7 +49,7 @@ * @ingroup ModalWindow */ Evas_Object * -mw_add(Evas_Smart_Cb func, void *data); +mw_add(void); /** * Set the title of the modal window. diff --git a/src/bin/ui/sound_manager.c b/src/bin/ui/sound_manager.c index ccb20d0..fdd177f 100644 --- a/src/bin/ui/sound_manager.c +++ b/src/bin/ui/sound_manager.c @@ -602,7 +602,7 @@ _sound_editor_main_markup_create(Sound_Editor *edit) assert(edit != NULL); - edit->win = mw_add(NULL, NULL); + edit->win = mw_add(); mw_title_set(edit->win, _("Sound manager")); ic = elm_icon_add(edit->win); elm_icon_standard_set(ic, "sound2"); diff --git a/src/bin/ui/style_manager.c b/src/bin/ui/style_manager.c index 9d6f6fe..0d699ca 100644 --- a/src/bin/ui/style_manager.c +++ b/src/bin/ui/style_manager.c @@ -926,7 +926,7 @@ style_manager_add() style_edit = (Style_Editor *)mem_calloc(1, sizeof(Style_Editor)); - style_edit->win = mw_add(NULL, NULL); + style_edit->win = mw_add(); mw_title_set(style_edit->win, _("Textblock style manager")); ic = elm_icon_add(style_edit->win); elm_icon_standard_set(ic, "text2"); --
