From: Chulheon <ch.jeong47@samsung.com>
Date: Tue, 24 Sep 2013 02:00:39 +0000 (+0900)
Subject: fixed bug (N_SE-52713, N_SE-52802)
X-Git-Tag: accepted/tizen/20131002.165803^2~92
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e2e078e1a3bcf9cfdb37429b50ae448eb0cfcc1;p=platform%2Fframework%2Fnative%2Fuifw.git

fixed bug (N_SE-52713, N_SE-52802)

Change-Id: I9e614c92f167bf3727978f8591244dd720322420
---

diff --git a/src/ui/controls/FUiCtrl_Edit.cpp b/src/ui/controls/FUiCtrl_Edit.cpp
index 53a8430..5711121 100755
--- a/src/ui/controls/FUiCtrl_Edit.cpp
+++ b/src/ui/controls/FUiCtrl_Edit.cpp
@@ -2168,7 +2168,7 @@ _Edit::OnAncestorEnableStateChanged(const _Control& control)
 
 	_pEditPresenter->SetKeypadEventSkipped(!enableState);
 
-	if (__inputStyle != INPUT_STYLE_FULLSCREEN)
+	if (__inputStyle != INPUT_STYLE_FULLSCREEN && !IsViewModeEnabled())
 	{
 		_pEditPresenter->SetCursorDisabled(!enableState);
 	}
diff --git a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
index e4e818d..559b33c 100644
--- a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
+++ b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
@@ -761,6 +761,7 @@ _EditCopyPasteHandler::CreateInstanceN(const Point& point, int handlerCursorPos,
 	pCopyPasteHandler->Open(false);
 	pCopyPasteHandler->SetBounds(bounds);
 	pCopyPasteHandler->CheckReverseStatus();
+	pCopyPasteHandler->AdjustBounds();
 
 	return pCopyPasteHandler;
 
@@ -806,6 +807,7 @@ _EditCopyPasteHandler::CreateInstanceN(const FloatPoint& point, int handlerCurso
 	pCopyPasteHandler->Open(false);
 	pCopyPasteHandler->SetBounds(bounds);
 	pCopyPasteHandler->CheckReverseStatus();
+	pCopyPasteHandler->AdjustBounds();
 
 	return pCopyPasteHandler;
 
diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index fb0fe41..1d757fc 100755
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -3341,6 +3341,8 @@ _EditPresenter::OnTouchPressed(const _Control& source, const _TouchInfo& touchIn
 bool
 _EditPresenter::OnTouchCanceled(const _Control& source, const _TouchInfo& touchinfo)
 {
+	InitializeCopyPasteManager();
+
 	if ((&source != __pEdit) || (__pEdit->GetEnableState() == false))
 	{
 		return false;
@@ -7292,7 +7294,14 @@ _EditPresenter::CalculateAbsoluteCursorBounds(int rowIndex, int columnIndex, Flo
 		}
 		else
 		{
-			absCursorBounds.height = __calculatedCursorBounds.height;
+			if (__calculatedCursorBounds.height > 0)
+			{
+				   absCursorBounds.height = __calculatedCursorBounds.height;
+			}
+			else
+			{
+				   absCursorBounds.height = cursorHeight;
+			}
 		}
 	}
 	else