rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=be293d957ccc0cbaa16840d974bcd46beedf9609
commit be293d957ccc0cbaa16840d974bcd46beedf9609 Author: Vyacheslav Reutskiy <v.reuts...@samsung.com> Date: Wed Oct 7 09:11:39 2015 +0300 popup: rename the popup argument entry to follow_up This generalizes the popup API agruments, not only can be used as target for popup foolowing Change-Id: Ia081463aa3d606d021a63edd35908eb0b9c3b6d5 --- src/bin/ui/main_window.h | 6 +++--- src/bin/ui/popup.c | 28 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/bin/ui/main_window.h b/src/bin/ui/main_window.h index 0df1619..4bc9892 100644 --- a/src/bin/ui/main_window.h +++ b/src/bin/ui/main_window.h @@ -415,13 +415,13 @@ void popup_buttons_disabled_set(Popup_Button p_btns, Eina_Bool disabled); void -popup_fileselector_folder_helper(Evas_Object *entry, const char *path); +popup_fileselector_folder_helper(Evas_Object *follow_up, const char *path); void -popup_fileselector_edj_helper(const char *title, Evas_Object *entry, const char *path); +popup_fileselector_edj_helper(const char *title, Evas_Object *follow_up, const char *path); void -popup_fileselector_edc_helper(Evas_Object *entry, const char *path); +popup_fileselector_edc_helper(Evas_Object *follow_up, const char *path); void popup_log_message_helper(const char *msg); diff --git a/src/bin/ui/popup.c b/src/bin/ui/popup.c index 2098f76..b518eb9 100644 --- a/src/bin/ui/popup.c +++ b/src/bin/ui/popup.c @@ -173,7 +173,7 @@ _popup_win_follow(void *data __UNUSED__, static void _fileselector_helper(const char *title, - Evas_Object *entry, + Evas_Object *follow_up, const char *path, Elm_Fileselector_Filter_Func filter_cb) { @@ -193,8 +193,8 @@ _fileselector_helper(const char *title, else elm_fileselector_folder_only_set(fs, true); elm_fileselector_path_set(fs, path ? path : getenv("HOME")); - evas_object_smart_callback_add(fs, "done", _open, entry); - evas_object_smart_callback_add(fs, "activated", _open, entry); + evas_object_smart_callback_add(fs, "done", _open, follow_up); + evas_object_smart_callback_add(fs, "activated", _open, follow_up); /* small hack, hide not necessary button */ evas_object_hide(elm_layout_content_unset(fs, "elm.swallow.cancel")); /* one more hack, set text our text to button 'ok' */ @@ -204,24 +204,24 @@ _fileselector_helper(const char *title, if (title) elm_object_text_set(popup, title); elm_layout_content_set(popup, "elm.swallow.content", fs); - if (entry) + if (follow_up) { - _popup_obj_follow(NULL, NULL, entry, NULL); - evas_object_event_callback_add(entry, EVAS_CALLBACK_RESIZE, _popup_obj_follow, NULL); - evas_object_event_callback_add(entry, EVAS_CALLBACK_MOVE, _popup_obj_follow, NULL); + _popup_obj_follow(NULL, NULL, follow_up, NULL); + evas_object_event_callback_add(follow_up, EVAS_CALLBACK_RESIZE, _popup_obj_follow, NULL); + evas_object_event_callback_add(follow_up, EVAS_CALLBACK_MOVE, _popup_obj_follow, NULL); } else { - _popup_win_follow(NULL, NULL, entry, NULL); + _popup_win_follow(NULL, NULL, NULL, NULL); evas_object_event_callback_add(ap.win, EVAS_CALLBACK_RESIZE, _popup_win_follow, NULL); } evas_object_show(popup); } void -popup_fileselector_folder_helper(Evas_Object *entry, const char *path) +popup_fileselector_folder_helper(Evas_Object *follow_up, const char *path) { - _fileselector_helper(NULL, entry, path, NULL); + _fileselector_helper(NULL, follow_up, path, NULL); } static Eina_Bool @@ -237,9 +237,9 @@ _edj_filter(const char *path, } void -popup_fileselector_edj_helper(const char *title, Evas_Object *entry, const char *path) +popup_fileselector_edj_helper(const char *title, Evas_Object *follow_up, const char *path) { - _fileselector_helper(title, entry, path, _edj_filter); + _fileselector_helper(title, follow_up, path, _edj_filter); } static Eina_Bool @@ -255,9 +255,9 @@ _edc_filter(const char *path, } void -popup_fileselector_edc_helper(Evas_Object *entry, const char *path) +popup_fileselector_edc_helper(Evas_Object *follow_up, const char *path) { - _fileselector_helper(NULL, entry, path, _edc_filter); + _fileselector_helper(NULL, follow_up, path, _edc_filter); } void --