X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller.cpp;h=74345ab0556f1db685915743efd0971293f6ec04;hp=b55a54306b865832903cdde0e783c6ea3750ecb4;hb=654e27038974c6515b65cece3a58ca49c1ed092f;hpb=b9872990feb603986a8e5784b0c9e09e67640d14

diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp
index b55a543..74345ab 100644
--- a/dali-toolkit/internal/text/text-controller.cpp
+++ b/dali-toolkit/internal/text/text-controller.cpp
@@ -84,6 +84,17 @@ void Controller::SetText( const std::string& text )
 
   CharacterIndex lastCursorIndex = 0u;
 
+  if( mImpl->mEventData )
+  {
+    // If popup shown then hide it by switching to Editing state
+    if ( EventData::SELECTING == mImpl->mEventData->mState ||
+         EventData::SELECTION_CHANGED == mImpl->mEventData->mState ||
+         EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState )
+    {
+      mImpl->ChangeState( EventData::EDITING );
+    }
+  }
+
   if( !text.empty() )
   {
     //  Convert text into UTF-32
@@ -1220,6 +1231,8 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ
       ResetText();
     }
 
+    mImpl->ChangeState( EventData::EDITING );
+
     // Handle the IMF (predicitive text) state changes
     if( mImpl->mEventData )
     {