From: Jisung Ahn Date: Fri, 25 Jan 2013 02:42:49 +0000 (+0900) Subject: add indicator area at setas, crop view X-Git-Tag: 2.1b_release~3^2~13^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d35d5e241a00376b4c9dbc19c94689ece0780a29;p=apps%2Fhome%2Fug-image-viewer-efl.git add indicator area at setas, crop view Change-Id: Ia4c35a3740f5a7f1e9c1081a0522cb1b9268cdfd --- diff --git a/main/layout/ivug-crop-view.edc b/main/layout/ivug-crop-view.edc index 30e97af..b1d8da2 100755 --- a/main/layout/ivug-crop-view.edc +++ b/main/layout/ivug-crop-view.edc @@ -44,6 +44,30 @@ collections { } } + part { + name: "indicator"; + type: RECT; + scale: 1; + repeat_events : 0; + description { + state: "default" 0.0; + min: 0 LAYOUT_INDICATOR_HEIGHT_INC; + // max: 0 LAYOUT_INDICATOR_HEIGHT_INC; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 0.0; + fixed: 0 1; + align: 0.5 0.0; + color: LAYOUT_INDICATOR_COLOR_INC; + visible: 0; + } + + description { + state: "hide" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + part { name: "crop.contents"; type: RECT; scale: 1; @@ -51,9 +75,9 @@ collections { description { state: "default" 0.0; color: 0 0 0 100; align: 0.0 0.0; - rel1.relative: 0.0 0.0; + rel1.relative: 0.0 1.0; rel1.to_x: "bg"; - rel1.to_y: "bg"; + rel1.to_y: "indicator"; rel1.offset: 0 0; rel2.relative: 1.0 0.0; rel2.to_x: "bg"; diff --git a/main/layout/ivug-setas.edc b/main/layout/ivug-setas.edc index 203dd6c..4135cc4 100755 --- a/main/layout/ivug-setas.edc +++ b/main/layout/ivug-setas.edc @@ -41,6 +41,30 @@ collections { } } + part { + name: "indicator"; + type: RECT; + scale: 1; + repeat_events : 0; + description { + state: "default" 0.0; + min: 0 LAYOUT_INDICATOR_HEIGHT_INC; + // max: 0 LAYOUT_INDICATOR_HEIGHT_INC; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 0.0; + fixed: 0 1; + align: 0.5 0.0; + color: LAYOUT_INDICATOR_COLOR_INC; + visible: 0; + } + + description { + state: "hide" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + part { name: "setasview.contents"; type: RECT; scale: 1; @@ -48,9 +72,9 @@ collections { description { state: "default" 0.0; color: 0 0 0 100; align: 0.0 0.0; - rel1.relative: 0.0 0.0; + rel1.relative: 0.0 1.0; rel1.to_x: "bg"; - rel1.to_y: "bg"; + rel1.to_y: "indicator"; rel1.offset: 0 0; rel2.relative: 1.0 0.0; rel2.to_x: "bg"; diff --git a/main/src/control/ivug-crop-ug.cpp b/main/src/control/ivug-crop-ug.cpp index 9985417..1bcf371 100755 --- a/main/src/control/ivug-crop-ug.cpp +++ b/main/src/control/ivug-crop-ug.cpp @@ -302,8 +302,8 @@ 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", ""); + //Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); + //elm_object_signal_emit(conformant, "elm,state,indicator,nooverlap", ""); return crop_ug; } @@ -374,8 +374,8 @@ 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", ""); + //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; @@ -437,8 +437,8 @@ bool ivug_crop_ug_start(IvugCropUG * crop_ug) MSG_HIGH("ivug_crop_ug_start"); IV_ASSERT(crop_ug != NULL); - Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); - elm_object_signal_emit(conformant, "elm,state,indicator,nooverlap", ""); + //Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); + //elm_object_signal_emit(conformant, "elm,state,indicator,nooverlap", ""); ivug_crop_view_file_set(crop_ug->crop_view, crop_ug->filepath); diff --git a/main/src/ug-image-viewer.cpp b/main/src/ug-image-viewer.cpp index 842dfd2..9687115 100755 --- a/main/src/ug-image-viewer.cpp +++ b/main/src/ug-image-viewer.cpp @@ -527,8 +527,8 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, service_h service, voi 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", ""); + //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); diff --git a/main/src/view/ivug-main-view-menu.cpp b/main/src/view/ivug-main-view-menu.cpp index 62d2374..e38600a 100755 --- a/main/src/view/ivug-main-view-menu.cpp +++ b/main/src/view/ivug-main-view-menu.cpp @@ -196,8 +196,8 @@ 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", ""); + //Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); + //elm_object_signal_emit(conformant, "elm,state,indicator,overlap", ""); if(pMainView->pSetAsView) { @@ -291,8 +291,8 @@ static void _ivug_crop_view_destroyed_cb(void *data, Evas_Object *obj, void *ev _update_title(pMainView); // after crop index changed - Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); - elm_object_signal_emit(conformant, "elm,state,indicator,overlap", ""); + //Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); + //elm_object_signal_emit(conformant, "elm,state,indicator,overlap", ""); } #if 0 @@ -403,8 +403,8 @@ 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", ""); + //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); @@ -1652,8 +1652,8 @@ _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", ""); + //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); diff --git a/main/src/view/ivug-main-view.cpp b/main/src/view/ivug-main-view.cpp index 8a3cd4e..ab62665 100755 --- a/main/src/view/ivug-main-view.cpp +++ b/main/src/view/ivug-main-view.cpp @@ -1305,8 +1305,8 @@ 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,overlap", ""); + //Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); + //elm_object_signal_emit(conformant, "elm,state,indicator,overlap", ""); evas_object_smart_callback_add((Evas_Object *)ug_get_window(), "profile,changed", _win_profile_changed_cb, pMainView); diff --git a/main/src/view/ivug-setas-view-callerid.cpp b/main/src/view/ivug-setas-view-callerid.cpp index a67f105..1f0fcc2 100755 --- a/main/src/view/ivug-setas-view-callerid.cpp +++ b/main/src/view/ivug-setas-view-callerid.cpp @@ -373,7 +373,7 @@ static Evas_Event_Flags _finger_tap_end(void *data , void *event_info) { MSG_SETAS_HIGH("Hide"); elm_win_indicator_mode_set((Evas_Object*)ug_get_window(), ELM_WIN_INDICATOR_HIDE); - //evas_object_hide(pSetAsData->notify); + evas_object_hide(pSetAsData->notify); } else { @@ -382,7 +382,7 @@ static Evas_Event_Flags _finger_tap_end(void *data , void *event_info) { elm_win_indicator_mode_set((Evas_Object *)ug_get_window(), ELM_WIN_INDICATOR_SHOW); } - //evas_object_show(pSetAsData->notify); + evas_object_show(pSetAsData->notify); } pSetAsData->bShowMenu = !pSetAsData->bShowMenu; @@ -451,7 +451,7 @@ Evas_Object *_ivug_setas_callerid_create_layout(Evas_Object *parent) evas_object_show(photocam); pSetAsData->bShowMenu = true; - _add_gesture_layer(pSetAsData->layout, pSetAsData); + //_add_gesture_layer(pSetAsData->layout, pSetAsData); MSG_SETAS_HIGH("Create setas layout"); pSetAsData->contents_area = ivug_default_layout_add(parent);