rimmed pushed a commit to branch eflete-1.18. http://git.enlightenment.org/tools/eflete.git/commit/?id=d2886b697217922c5977c4eb9132029fa72da549
commit d2886b697217922c5977c4eb9132029fa72da549 Author: Andrii Kroitor <an.kroi...@samsung.com> Date: Fri Sep 2 16:41:17 2016 +0300 group_navigator: use async popup for program add --- src/bin/ui/workspace/group_navigator.c | 39 +++++++++++++--------------------- 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/src/bin/ui/workspace/group_navigator.c b/src/bin/ui/workspace/group_navigator.c index 2e6555d..3317c89 100644 --- a/src/bin/ui/workspace/group_navigator.c +++ b/src/bin/ui/workspace/group_navigator.c @@ -888,12 +888,12 @@ _program_validate(void *data, if (resource_name_validator_status_get(pl->program_name_validator) != ELM_REG_NOERROR) { - popup_buttons_disabled_set(BTN_OK, true); + popup_button_disabled_set(pl->popup_win, BTN_OK, true); elm_object_signal_emit(obj, "validation,default,fail", "elm"); } else { - popup_buttons_disabled_set(BTN_OK, false); + popup_button_disabled_set(pl->popup_win, BTN_OK, false); elm_object_signal_emit(obj, "validation,default,pass", "elm"); } } @@ -1576,10 +1576,13 @@ _on_menu_add_item_clicked(void *data __UNUSED__, } static void -_popup_add_program_ok_clicked(void *data, - Evas_Object *obj __UNUSED__, - void *event_info __UNUSED__) +_popup_add_program_close_cb(void *data, + Evas_Object *obj __UNUSED__, + void *event_info) { + Popup_Button pb = (Popup_Button) event_info; + if (pb != BTN_OK) return; + Edje_Action_Type type = EDJE_ACTION_TYPE_NONE; Part_List *pl = data; const char *name; @@ -1630,20 +1633,9 @@ _popup_add_program_ok_clicked(void *data, history_change_add(pl->group->history, change); eina_stringshare_del(msg); - evas_object_del(pl->popup.box); } -Eina_Bool -_popup_add_program_validator(void *data) -{ - Part_List *pl = (Part_List *) data; - _popup_add_program_ok_clicked(data, NULL, NULL); - if (resource_name_validator_status_get(pl->program_name_validator) != ELM_REG_NOERROR) - return false; - return true; -} - -Evas_Object * +static Evas_Object * _add_program_content_get(void *data, Evas_Object **to_focus) { Part_List *pl = (Part_List *) data; @@ -1651,7 +1643,7 @@ _add_program_content_get(void *data, Evas_Object **to_focus) unsigned int i = 0; Combobox_Item *combobox_item; - BOX_ADD(ap.popup, box, false, false); + BOX_ADD(ap.win, box, false, false); elm_box_padding_set(box, 0, 10); LAYOUT_PROP_ADD(box, _("Program name"), "popup", "1swallow") @@ -1684,7 +1676,6 @@ _add_program_content_get(void *data, Evas_Object **to_focus) elm_box_pack_end(box, item); pl->popup.box = box; if (to_focus) *to_focus = pl->popup.entry_name; - popup_buttons_disabled_set(BTN_OK, true); return pl->popup.box; } @@ -1700,12 +1691,12 @@ _on_menu_add_program_clicked(void *data __UNUSED__, assert(pl != NULL); title = eina_stringshare_add(_("Add New Program")); - Popup_Button button = popup_want_action(title, NULL, _add_program_content_get, - BTN_OK | BTN_CANCEL, - _popup_add_program_validator, pl); + pl->popup_win = popup_add(title, NULL, + BTN_OK | BTN_CANCEL, + _add_program_content_get, pl); + evas_object_smart_callback_add(pl->popup_win, POPUP_CLOSE_CB, _popup_add_program_close_cb, pl); + popup_button_disabled_set(pl->popup_win, BTN_OK, true); - if (button == BTN_CANCEL) - evas_object_del(pl->popup.box); eina_stringshare_del(title); } --