diff options
| author | Jaeyun Jeong <jyjeong@tizendev.org> | 2012-09-03 09:08:07 +0900 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@localhost> | 2012-09-03 09:08:07 +0900 |
| commit | f2acef7ac0024c76fb7ebc5c21c38622b10cb251 (patch) | |
| tree | 11c2d14a08cf236244668e222996ae9751a62607 | |
| parent | 985fca142b4175251b8987ab368f16041359356b (diff) | |
| parent | 2ae19e20c8e0489109a37d5bf1f7efd353891a89 (diff) | |
| download | message-app-f2acef7ac0024c76fb7ebc5c21c38622b10cb251.tar.gz message-app-f2acef7ac0024c76fb7ebc5c21c38622b10cb251.tar.bz2 message-app-f2acef7ac0024c76fb7ebc5c21c38622b10cb251.zip | |
Merge "fix N_SE-8504. change popup's parent window" into 2.0_beta
| -rwxr-xr-x | thread/src/msg-ui-thread-callback.c | 3 | ||||
| -rwxr-xr-x | thread/src/msg-ui-thread-util.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/thread/src/msg-ui-thread-callback.c b/thread/src/msg-ui-thread-callback.c index 0e408a8..205144f 100755 --- a/thread/src/msg-ui-thread-callback.c +++ b/thread/src/msg-ui-thread-callback.c @@ -374,6 +374,7 @@ void msg_ui_thread_ctlbar_message_box_cb(void *data, Evas_Object *obj, void *eve MSG_UI_RET_IF(MSG_UI_LEVEL_ERR, !data || !obj); PMSG_THREAD_LIST_DATA pListData = (PMSG_THREAD_LIST_DATA)data; + PMSG_THREAD_DATA pData = msg_ui_thread_get_data(); Elm_Object_Item* it_sweep = NULL; if (pListData->popup) { @@ -389,7 +390,7 @@ void msg_ui_thread_ctlbar_message_box_cb(void *data, Evas_Object *obj, void *eve // Create pop-up ( Spam / SIM (it will be extended) ) Evas_Object *ctx_popup = NULL; - ctx_popup = elm_ctxpopup_add(pListData->content_ly); + ctx_popup = elm_ctxpopup_add(pData->navi_frame); evas_object_smart_callback_add(ctx_popup, "dismissed", __msg_ui_thread_ctxpopup_dismissed_cb, pListData); elm_ctxpopup_item_append(ctx_popup, dgettext(MESSAGE_PKGNAME, "IDS_MSGF_BODY_SPAM_MESSAGES"), NULL, __msg_ui_thread_ctxpopup_clicked_cb, pListData); diff --git a/thread/src/msg-ui-thread-util.c b/thread/src/msg-ui-thread-util.c index 1ed004f..8d33dab 100755 --- a/thread/src/msg-ui-thread-util.c +++ b/thread/src/msg-ui-thread-util.c @@ -549,8 +549,9 @@ void msg_ui_thread_show_del_popup(PMSG_THREAD_LIST_DATA pListData, const char *m Evas_Object *popup; Evas_Object *btn_ok; Evas_Object *btn_cancel; + PMSG_THREAD_DATA pData = msg_ui_thread_get_data(); - popup = elm_popup_add(pListData->content_ly); + popup = elm_popup_add(pData->navi_frame); evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_object_text_set(popup, msg); @@ -661,8 +662,9 @@ Evas_Object* msg_ui_thread_show_notify_with_progressbar(PMSG_THREAD_LIST_DATA pL Evas_Object *popup, *progressbar, *box, *label; char buf[DEF_BUF_LEN_S] = {0,}; + PMSG_THREAD_DATA pData = msg_ui_thread_get_data(); - popup = elm_popup_add(pListData->content_ly); + popup = elm_popup_add(pData->navi_frame); label = elm_label_add(popup); snprintf(buf, sizeof(buf), "0/%d %s", count, dgettext("sys_string", "IDS_COM_POP_DELETED")); |