Merge "Minor fixes for Text." into devel/master

diff --combined dali-toolkit/internal/text/text-controller.cpp
index 74345ab,94890ae..32e3ed3
--- 1/dali-toolkit/internal/text/text-controller.cpp
--- 2/dali-toolkit/internal/text/text-controller.cpp
+++ b/dali-toolkit/internal/text/text-controller.cpp
@@@ -84,17 -84,6 +84,17 @@@ void Controller::SetText( const std::st
  
    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
@@@ -1231,8 -1220,6 +1231,8 @@@ void Controller::InsertText( const std:
        ResetText();
      }
  
 +    mImpl->ChangeState( EventData::EDITING );
 +
      // Handle the IMF (predicitive text) state changes
      if( mImpl->mEventData )
      {
@@@ -1338,9 -1325,8 +1338,8 @@@ void Controller::TapEvent( unsigned in
      const bool isShowingPlaceholderText = mImpl->IsShowingPlaceholderText();
      if( 1u == tapCount )
      {
-       bool tapDuringEditMode( EventData::EDITING == mImpl->mEventData->mState );
- 
-       if( !isShowingPlaceholderText && tapDuringEditMode )
+       if( !isShowingPlaceholderText &&
+           ( EventData::EDITING == mImpl->mEventData->mState ) )
        {
          mImpl->mEventData->mDecorator->SetHandleActive( GRAB_HANDLE, true );
          mImpl->mEventData->mDecorator->SetPopupActive( false );