From a3063f49a158988bc0dc9b8442f2b1545f313fb7 Mon Sep 17 00:00:00 2001 From: Jisung Ahn Date: Mon, 14 Jan 2013 13:59:42 +0900 Subject: [PATCH] apply conformant change Change-Id: Ibbfac4f0e64bd8059d005b7d4e69f576cdd891da --- main/src/control/ivug-crop-ug.cpp | 6 ++++++ main/src/ug-image-viewer.cpp | 7 ++++++- main/src/view/ivug-main-view-menu.cpp | 32 ++++++++++++++++++++++++++++++++ main/src/view/ivug-main-view.cpp | 3 +++ main/src/view/ivug-name-view.c | 3 +++ 5 files changed, 50 insertions(+), 1 deletion(-) diff --git a/main/src/control/ivug-crop-ug.cpp b/main/src/control/ivug-crop-ug.cpp index c68a404..1a5507e 100755 --- a/main/src/control/ivug-crop-ug.cpp +++ b/main/src/control/ivug-crop-ug.cpp @@ -302,6 +302,9 @@ IvugCropUG * ivug_crop_ug_create(Evas_Object *parent, int w, int h, bool bRatioF ivug_crop_view_create_menu(crop_view, crop_ug->navi_bar); + Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); + elm_object_signal_emit(conformant, "elm,state,indicator,nooverlap", ""); + return crop_ug; } @@ -371,6 +374,9 @@ IvugCropUG * ivug_setas_crop_ug_create(Evas_Object *parent, const char *filepath crop_ug->navi_it = elm_naviframe_item_push(crop_ug->navi_bar, IDS_LOADING, back_btn, NULL, crop_ug->layout, NULL); elm_naviframe_item_title_visible_set(crop_ug->navi_it, EINA_FALSE); + Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); + elm_object_signal_emit(conformant, "elm,state,indicator,nooverlap", ""); + int lcd_x = 0; int lcd_y = 0; int lcd_w = 0; diff --git a/main/src/ug-image-viewer.cpp b/main/src/ug-image-viewer.cpp index f2bd46c..aba3d8d 100755 --- a/main/src/ug-image-viewer.cpp +++ b/main/src/ug-image-viewer.cpp @@ -335,6 +335,7 @@ static Evas_Object *create_frameview(Evas_Object *parent, struct ug_data *ugd) static void *on_create(ui_gadget_h ug, enum ug_mode mode, service_h service, void *priv) { struct ug_data *ugd; + Evas_Object *conformant; PERF_CHECK_END(LVL0, "UG_MODULE_INIT -> On Create"); @@ -518,6 +519,10 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, service_h service, voi ugd->navi_it = elm_naviframe_item_push(ugd->navi_bar, NULL, back_btn, NULL, setasOjbect, NULL); + elm_naviframe_item_title_visible_set(ugd->navi_it, EINA_FALSE); + + conformant = (Evas_Object *)ug_get_conformant(); + elm_object_signal_emit(conformant, "elm,state,indicator,nooverlap", ""); ivug_setas_view_create_menu(ugd->setas_view, ugd->navi_bar, type); @@ -964,7 +969,7 @@ extern "C" UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops) ops->message = on_message; ops->event = on_event; ops->priv = ugd; - ops->opt = UG_OPT_INDICATOR_ENABLE; + ops->opt = (ug_option)(UG_OPT_INDICATOR_ENABLE | UG_OPT_OVERLAP_ENABLE); PERF_CHECK_BEGIN(LVL0, "UG_MODULE_INIT -> On Create"); diff --git a/main/src/view/ivug-main-view-menu.cpp b/main/src/view/ivug-main-view-menu.cpp index ae4618e..0357253 100755 --- a/main/src/view/ivug-main-view-menu.cpp +++ b/main/src/view/ivug-main-view-menu.cpp @@ -122,6 +122,8 @@ static void _on_add_tag_view_response(ivug_name_response resp, const char *str, Media_Item *mitem = NULL; Media_Data *mdata = NULL; + Evas_Object *conformant = NULL; + switch(resp) { case NAME_VIEW_RESPONSE_OK: @@ -145,6 +147,9 @@ static void _on_add_tag_view_response(ivug_name_response resp, const char *str, elm_naviframe_item_pop(pMainView->navi_bar); pMainView->navi_it = elm_naviframe_top_item_get(pMainView->navi_bar); + + conformant = (Evas_Object *)ug_get_conformant(); + elm_object_signal_emit(conformant, "elm,state,indicator,overlap", ""); break; case NAME_VIEW_RESPONSE_CANCEL: MSG_MAIN_HIGH("Add tag is canceled"); @@ -154,6 +159,9 @@ static void _on_add_tag_view_response(ivug_name_response resp, const char *str, elm_naviframe_item_pop(pMainView->navi_bar); pMainView->navi_it = elm_naviframe_top_item_get(pMainView->navi_bar); + + conformant = (Evas_Object *)ug_get_conformant(); + elm_object_signal_emit(conformant, "elm,state,indicator,overlap", ""); break; default: MSG_MAIN_ERROR("Unhandled mode : %d", resp); @@ -187,6 +195,9 @@ static void _on_setas_view_destroyed(void *data, Evas_Object *obj, void *event_i pMainView->navi_it = elm_naviframe_top_item_get(pMainView->navi_bar); + Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); + elm_object_signal_emit(conformant, "elm,state,indicator,overlap", ""); + if(pMainView->pSetAsView) { ivug_setas_view_destroy(pMainView->pSetAsView); @@ -276,6 +287,9 @@ static void _ivug_crop_view_destroyed_cb(void *data, Evas_Object *obj, void *ev pMainView->navi_it = elm_naviframe_top_item_get(pMainView->navi_bar); elm_naviframe_item_title_visible_set(pMainView->navi_it, EINA_TRUE); + + Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); + elm_object_signal_emit(conformant, "elm,state,indicator,overlap", ""); } #if 0 @@ -374,6 +388,9 @@ static void _create_setas_view(Ivug_MainView *pMainView, const char *filepath, i pMainView->navi_it = elm_naviframe_item_push(pMainView->navi_bar, NULL, btn_back, NULL, pCropView->layout, NULL); + Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); + elm_object_signal_emit(conformant, "elm,state,indicator,nooverlap", ""); + ivug_crop_view_create_menu(pCropView, pMainView->navi_bar); ivug_crop_view_file_set(pCropView, filepath); @@ -495,6 +512,9 @@ void _on_addtag_selected(void *data, Evas_Object *obj, void *event_info) pMainView->navi_it = elm_naviframe_item_push(pMainView->navi_bar, NULL, NULL, NULL, layout, NULL); + Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); + elm_object_signal_emit(conformant, "elm,state,indicator,nooverlap", ""); + elm_naviframe_item_title_visible_set(pMainView->navi_it, EINA_FALSE); elm_object_item_signal_emit(pMainView->navi_it, "elm,state,toolbar,close", ""); @@ -1029,6 +1049,9 @@ static void _on_rename_view_response(ivug_name_response resp, const char *str, v elm_naviframe_item_pop(pMainView->navi_bar); pMainView->navi_it = elm_naviframe_top_item_get(pMainView->navi_bar); + + Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); + elm_object_signal_emit(conformant, "elm,state,indicator,overlap", ""); return; } @@ -1068,6 +1091,9 @@ static void _on_rename_view_response(ivug_name_response resp, const char *str, v elm_naviframe_item_pop(pMainView->navi_bar); pMainView->navi_it = elm_naviframe_top_item_get(pMainView->navi_bar); + + Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); + elm_object_signal_emit(conformant, "elm,state,indicator,overlap", ""); } @@ -1112,6 +1138,9 @@ _ivug_detail_view_rename_clicked_cb(void *data, Evas_Object *obj, void *event_in pMainView->navi_it = elm_naviframe_item_push(pMainView->navi_bar, NULL, NULL, NULL, layout, NULL); + Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); + elm_object_signal_emit(conformant, "elm,state,indicator,nooverlap", ""); + elm_naviframe_item_title_visible_set(pMainView->navi_it, EINA_FALSE); elm_object_item_signal_emit(pMainView->navi_it, "elm,state,toolbar,close", ""); @@ -1618,6 +1647,9 @@ _on_crop_selected(void *data, Evas_Object *obj) pMainView->navi_it = elm_naviframe_item_push(pMainView->navi_bar, NULL, btn_back, NULL, pCropView->layout, NULL); + Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); + elm_object_signal_emit(conformant, "elm,state,indicator,nooverlap", ""); + ivug_crop_view_create_menu(pCropView, pMainView->navi_bar); ivug_crop_view_file_set(pCropView, mdata->filepath); diff --git a/main/src/view/ivug-main-view.cpp b/main/src/view/ivug-main-view.cpp index 87ac50c..d7f2e08 100755 --- a/main/src/view/ivug-main-view.cpp +++ b/main/src/view/ivug-main-view.cpp @@ -1303,6 +1303,9 @@ ivug_main_view_create(Evas_Object* parent, ivug_mode mode, ivug_view_by view_by) pMainView->navi_it = elm_naviframe_item_push(pMainView->navi_bar, NULL, pMainView->back_btn, NULL, pMainView->empty_layout, NULL); PERF_CHECK_END(LVL2, "elm_naviframe_item_push"); + Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); + elm_object_signal_emit(conformant, "elm,state,indicator,nooverlap", ""); + evas_object_smart_callback_add((Evas_Object *)ug_get_window(), "profile,changed", _win_profile_changed_cb, pMainView); _create_main_menu(pMainView); diff --git a/main/src/view/ivug-name-view.c b/main/src/view/ivug-name-view.c index d47ae6a..825057b 100755 --- a/main/src/view/ivug-name-view.c +++ b/main/src/view/ivug-name-view.c @@ -387,6 +387,9 @@ ivug_name_view_create(Evas_Object *parent, const char *title) Elm_Object_Item *navi_it = NULL; navi_it = elm_naviframe_item_push(pNameView->navibar, title, NULL, NULL, pNameView->content, NULL); + Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); + elm_object_signal_emit(conformant, "elm,state,indicator,nooverlap", ""); + //ivug_name_view_set_focus(pNameView); elm_object_item_part_content_set(navi_it, "title_toolbar_button1", done_button); -- 2.7.4