From 677b6f31dce2ea35562db1025ce40b106a5857c8 Mon Sep 17 00:00:00 2001 From: Jisung Ahn Date: Tue, 15 Jan 2013 21:32:57 +0900 Subject: [PATCH] [TEMP] donot resize twice Change-Id: I4cf350ebea976d902e9529abdf170983b7571ba4 --- main/src/control/ivug-crop-ug.cpp | 3 +++ main/src/include/ivug-crop-view.h | 1 + main/src/view/ivug-crop-view.cpp | 13 ++++++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/main/src/control/ivug-crop-ug.cpp b/main/src/control/ivug-crop-ug.cpp index 1a5507e..7eeaa5c 100755 --- a/main/src/control/ivug-crop-ug.cpp +++ b/main/src/control/ivug-crop-ug.cpp @@ -437,6 +437,9 @@ 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", ""); + ivug_crop_view_file_set(crop_ug->crop_view, crop_ug->filepath); return true; diff --git a/main/src/include/ivug-crop-view.h b/main/src/include/ivug-crop-view.h index 5ef5cca..35d0384 100755 --- a/main/src/include/ivug-crop-view.h +++ b/main/src/include/ivug-crop-view.h @@ -60,6 +60,7 @@ typedef struct { Ecore_Timer *box_timer; + int PrevRotate; } IvugCropView; /* diff --git a/main/src/view/ivug-crop-view.cpp b/main/src/view/ivug-crop-view.cpp index d0a302c..304b10e 100755 --- a/main/src/view/ivug-crop-view.cpp +++ b/main/src/view/ivug-crop-view.cpp @@ -41,6 +41,15 @@ static void _on_layout_resized(void *data, Evas *e, Evas_Object *obj, void *even { IvugCropView *pCropView = static_cast(data); /////////////////////////////////////////////////////////////////// + + int rotate = gGetRotationDegree(); + MSG_HIGH("rotate=%d", rotate); + if(pCropView->PrevRotate == rotate) + { + return; + } + pCropView->PrevRotate = rotate; + int org_x, org_y, org_w, org_h; ivug_image_region_get(pCropView->photocam, &org_x, &org_y, &org_w, &org_h); @@ -217,7 +226,7 @@ void _on_preloaded(void *data, Evas_Object *obj, void *event_info) if(pCropView->box_timer) ecore_timer_del(pCropView->box_timer); - pCropView->box_timer = ecore_timer_add(0.3, _on_box_timer_expired, data); + pCropView->box_timer = ecore_timer_add(0.5, _on_box_timer_expired, data); pCropView->notify_area = const_cast(edje_object_part_object_get(_EDJ(pCropView->layout), "crop.contents.swallow.notify")); @@ -225,6 +234,8 @@ void _on_preloaded(void *data, Evas_Object *obj, void *event_info) pCropView->notify = ivug_notify_static_create(pCropView->notify_area, IDS_CROP_NOTIFY, NOTIFY_ALIGN_BOTTOM); evas_object_show(pCropView->photocam); + + pCropView->PrevRotate = gGetRotationDegree(); } static void -- 2.7.4