From 654e27038974c6515b65cece3a58ca49c1ed092f Mon Sep 17 00:00:00 2001 From: Agnelo Vaz Date: Thu, 25 Jun 2015 11:52:56 +0100 Subject: [PATCH] Text Selection Popup should hide when text inserted or set Select, Select All Popup should hide when predicitve text inserted. Also if SetText is called then Popup should also hide Change-Id: I39f05b49c49056c6b018eaec43431e7a9667194e Signed-off-by: Agnelo Vaz --- dali-toolkit/internal/text/text-controller.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 ) { -- 2.7.4