From: Mahesh Krishna Nagabhushan Date: Mon, 26 Aug 2013 11:51:15 +0000 (+0530) Subject: Fixed JIRA issues(48851, 49768) X-Git-Tag: 2.2.1_release~21^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=22df3c56fe6db63ece39f5ff615c293af20770d9;p=apps%2Fosp%2FMemo.git Fixed JIRA issues(48851, 49768) Change-Id: Ibfed561dfdac255e80d0274a0b8a0b16a91c08b3 Signed-off-by: Mahesh Krishna Nagabhushan --- diff --git a/res/screen-size-normal/IDL_MEMO_DRAWING_DETAIL.xml b/res/screen-size-normal/IDL_MEMO_DRAWING_DETAIL.xml index 0727f43..2740a30 100644 --- a/res/screen-size-normal/IDL_MEMO_DRAWING_DETAIL.xml +++ b/res/screen-size-normal/IDL_MEMO_DRAWING_DETAIL.xml @@ -25,22 +25,22 @@ - - + + - + - - + + - - + + diff --git a/res/screen-size-normal/IDL_MEMO_DRAWING_EDITOR.xml b/res/screen-size-normal/IDL_MEMO_DRAWING_EDITOR.xml index ecb8f3f..150d8e0 100644 --- a/res/screen-size-normal/IDL_MEMO_DRAWING_EDITOR.xml +++ b/res/screen-size-normal/IDL_MEMO_DRAWING_EDITOR.xml @@ -52,12 +52,12 @@ - + - - + + @@ -67,7 +67,7 @@ - + diff --git a/src/MmDrawingEditorForm.cpp b/src/MmDrawingEditorForm.cpp index baa2d88..c891266 100644 --- a/src/MmDrawingEditorForm.cpp +++ b/src/MmDrawingEditorForm.cpp @@ -1707,7 +1707,13 @@ MemoDrawingEditorForm::OnTouchReleased(const Control& source, const Point& curre { if(__pComment == &source) { - if (__pCommentEditAreaPressed.x == currentPosition.x && __pCommentEditAreaPressed.y == currentPosition.y) + Point threshold; + threshold.x = (currentPosition.x>__pCommentEditAreaPressed.x)?\ + (currentPosition.x - __pCommentEditAreaPressed.x):(__pCommentEditAreaPressed.x - currentPosition.x); + threshold.y = (currentPosition.y>__pCommentEditAreaPressed.y)?\ + (currentPosition.y - __pCommentEditAreaPressed.y):(__pCommentEditAreaPressed.y - currentPosition.y); + + if (threshold.x < 10 && threshold.y < 10) { SceneManager* pSceneManager = SceneManager::GetInstance(); String commentText = __pComment->GetText(); diff --git a/src/MmTypes.cpp b/src/MmTypes.cpp index 4f30f84..d3464c5 100644 --- a/src/MmTypes.cpp +++ b/src/MmTypes.cpp @@ -72,14 +72,14 @@ const int H_LIST_ITEM_IMAGE = 96; const int H_TOOLBAR_BUTTON = 52; const int W_TOOLBAR_BUTTON = 70; const int H_TOOLBAR = 72; -const int H_CREATE_SCENE_COMMENT_PANEL = 98; +const int H_CREATE_SCENE_COMMENT_PANEL = 138; const int H_CREATE_SCENE_BUTTON = 66; const int H_CREATE_SCENE_CONTROL_PANEL = 86; const int H_CREATE_SCENE_DATETIME_PANEL = 64; const int W_CREATE_SCENE_DATETIME_LABEL = 700; const int H_CREATE_SCENE_DATETIME_LABEL = 48; const int W_CREATE_SCENE_COMMENT = 668;//700; -const int H_CREATE_SCENE_COMMENT = 82; +const int H_CREATE_SCENE_COMMENT = 122; const int Y_CREATE_SCENE_COMMENT = 8; const int GAP_BETWEEN_CONTROLS = 10; const int Y_KEYPAD = 693; @@ -147,7 +147,7 @@ const wchar_t* IDB_SELECT_ALL = L"00_icon_select_all_web.png"; //font sizes const int FONT_SIZE_NORMAL = 32; const int FONT_SIZE_DATETIME = 32; -const int FONT_SIZE_COMMENT = 30; +const int FONT_SIZE_COMMENT = 35; const int FONT_SIZE_CONTENT = 44; //constants used in memo