From: Paul Wisbey <p.wisbey@samsung.com>
Date: Wed, 24 Jun 2015 17:46:20 +0000 (+0100)
Subject: Don't replace pasted text with pre-edit text
X-Git-Tag: dali_1.0.47~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=12b42282381c1915961c7571bd55c5d323a2506b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

Don't replace pasted text with pre-edit text

Change-Id: Iadd7d25177d6c9f98d7ff773baedc9319b4560cb
---

diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp
index 52c64dd..b55a543 100644
--- a/dali-toolkit/internal/text/text-controller.cpp
+++ b/dali-toolkit/internal/text/text-controller.cpp
@@ -1500,7 +1500,7 @@ void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Butt
     {
       std::string stringToPaste("");
       mImpl->GetTextFromClipboard( 0, stringToPaste ); // Paste latest item from system clipboard
-      InsertText( stringToPaste, Text::Controller::CLIPBOARD );
+      InsertText( stringToPaste, Text::Controller::COMMIT );
       mImpl->ChangeState( EventData::EDITING );
       mImpl->RequestRelayout();
       break;
diff --git a/dali-toolkit/internal/text/text-controller.h b/dali-toolkit/internal/text/text-controller.h
index cac83ee..2f83407 100644
--- a/dali-toolkit/internal/text/text-controller.h
+++ b/dali-toolkit/internal/text/text-controller.h
@@ -103,8 +103,7 @@ public:
   enum InsertType
   {
     COMMIT,
-    PRE_EDIT,
-    CLIPBOARD
+    PRE_EDIT
   };
 
   /**