Fixed JIRA issues(48851, 49768)

Change-Id: Ibfed561dfdac255e80d0274a0b8a0b16a91c08b3
Signed-off-by: Mahesh Krishna Nagabhushan <mahesh.kn@samsung.com>

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 (file)
--- a/res/screen-size-normal/IDL_MEMO_DRAWING_DETAIL.xml
+++ b/res/screen-size-normal/IDL_MEMO_DRAWING_DETAIL.xml
@@ -25,22 +25,22 @@
     </Label>
     <Panel id="IDC_PANEL_COMMENT" parent="IDL_MEMO_DRAWING_DETAIL">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="98" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="913"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="61" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="403"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="138.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="878.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="61.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="403.0"/>
     </Panel>
     <EditArea id="IDC_COMMENT" parent="IDC_PANEL_COMMENT">
         <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" guideText="::IDS_MEMO_BODY_ADD_COMMENT" guideTextColor="" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16.0" inputStyle="INPUT_STYLE_FULLSCREEN" keypadAction="" keypadStyle="KEYPAD_STYLE_NORMAL" limitLength="100" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="45.0" verticalMargin="12.0" viewMode="true"/>
-        <layout height="82.0" mode="Portrait" width="680.0" x="24.0" y="8.0"/>
+        <layout height="122.0" mode="Portrait" width="668.0" x="26.0" y="8.0"/>
         <layout height="661.0" mode="Landscape" width="92.0" x="3.0" y="0.0"/>
     </EditArea>
     <Panel id="IDC_PANEL_DATETIME" parent="IDL_MEMO_DRAWING_DETAIL">
         <property backgroundColor="#FFFFFF" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="55" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="1274" x="0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="64.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="1274.0" x="0.0" y="0.0"/>
     </Panel>
     <Panel id="IDC_PANEL_DRAWING" parent="IDL_MEMO_DRAWING_DETAIL">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="854" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="64"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="464" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="1274" x="0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="814.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="64.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="464.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="1274.0" x="0.0" y="0.0"/>
     </Panel>
 </Scene>

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 (file)
--- a/res/screen-size-normal/IDL_MEMO_DRAWING_EDITOR.xml
+++ b/res/screen-size-normal/IDL_MEMO_DRAWING_EDITOR.xml
@@ -52,12 +52,12 @@
     </Button>
     <Panel id="IDC_PANEL_COMMENT" parent="IDL_MEMO_DRAWING_EDITOR">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="IDL_MEMO_DRAWING_EDITOR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="98.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="1026.0"/>
+        <layout bottomRelation="IDL_MEMO_DRAWING_EDITOR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="138.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="986.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="98.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="1276.0" x="0.0" y="348.0"/>
     </Panel>
     <EditArea id="IDC_COMMENT" parent="IDC_PANEL_COMMENT">
-        <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" guideText="::IDS_MEMO_BODY_ADD_COMMENT" guideTextColor="" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16.0" inputStyle="INPUT_STYLE_FULLSCREEN" keypadAction="" keypadStyle="KEYPAD_STYLE_NORMAL" limitLength="100" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="45.0" verticalMargin="12.0" viewMode="false"/>\r
-        <layout height="90.0" mode="Portrait" width="668.0" x="26.0" y="8.0"/>
+        <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" guideText="::IDS_MEMO_BODY_ADD_COMMENT" guideTextColor="" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16.0" inputStyle="INPUT_STYLE_FULLSCREEN" keypadAction="" keypadStyle="KEYPAD_STYLE_NORMAL" limitLength="100" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="45.0" verticalMargin="12.0" viewMode="true"/>
+        <layout height="122.0" mode="Portrait" width="668.0" x="26.0" y="8.0"/>
         <layout height="661.0" mode="Landscape" width="95.0" x="1.0" y="0.0"/>
     </EditArea>
     <Panel id="IDC_PANEL_DATETIME" parent="IDL_MEMO_DRAWING_EDITOR">
@@ -67,7 +67,7 @@
     </Panel>
     <Panel id="IDC_PANEL_DRAWING" parent="IDL_MEMO_DRAWING_EDITOR">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="890.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="136.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="850.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="136.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="487.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="1272.0" x="0.0" y="0.0"/>
     </Panel>
     <Panel id="IDC_PANEL_COLORPICKER" parent="IDL_MEMO_DRAWING_EDITOR">

diff --git a/src/MmDrawingEditorForm.cpp b/src/MmDrawingEditorForm.cpp
index baa2d88..c891266 100644 (file)
--- 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 (file)
--- 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