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=9e1d0dc4f46d7efc2880684c0ffe5b4958159ed2;hp=28919533965377f4a996102026f86b32e5fecf60;hb=c156fa43a739e26d4d1ad187848968248078839f;hpb=479693b4fd773eb8888ae401d02b49188293e231 diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index 2891953..9e1d0dc 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -40,7 +40,6 @@ namespace #endif const float MAX_FLOAT = std::numeric_limits::max(); -const unsigned int POINTS_PER_INCH = 72; const std::string EMPTY_STRING(""); @@ -292,9 +291,6 @@ void Controller::SetText( const std::string& text ) mImpl->mEventData->mEventQueue.clear(); } - // Notify IMF as text changed - NotifyImfManager(); - // Do this last since it provides callbacks into application code mImpl->mControlInterface.TextChanged(); } @@ -303,12 +299,8 @@ void Controller::GetText( std::string& text ) const { if( !mImpl->IsShowingPlaceholderText() ) { - Vector& utf32Characters = mImpl->mLogicalModel->mText; - - if( 0u != utf32Characters.Count() ) - { - Utf32ToUtf8( &utf32Characters[0], utf32Characters.Count(), text ); - } + // Retrieves the text string. + mImpl->GetText( 0u, text ); } else { @@ -316,16 +308,6 @@ void Controller::GetText( std::string& text ) const } } -unsigned int Controller::GetLogicalCursorPosition() const -{ - if( NULL != mImpl->mEventData ) - { - return mImpl->mEventData->mPrimaryCursorPosition; - } - - return 0u; -} - void Controller::SetPlaceholderText( PlaceholderType type, const std::string& text ) { if( NULL != mImpl->mEventData ) @@ -508,15 +490,6 @@ void Controller::SetDefaultPointSize( float pointSize ) mImpl->mFontDefaults->mDefaultPointSize = pointSize; mImpl->mFontDefaults->sizeDefined = true; - unsigned int horizontalDpi( 0u ); - unsigned int verticalDpi( 0u ); - mImpl->mFontClient.GetDpi( horizontalDpi, verticalDpi ); - - // Adjust the metrics if the fixed-size font should be down-scaled - int maxEmojiSize( pointSize/POINTS_PER_INCH * verticalDpi ); - DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetDefaultPointSize %p setting MaxEmojiSize %d\n", this, maxEmojiSize ); - mImpl->mMetrics->SetMaxEmojiSize( maxEmojiSize ); - // Clear the font-specific data ClearFontData(); @@ -1406,17 +1379,18 @@ float Controller::GetHeightForWidth( float width ) return layoutSize.height; } -bool Controller::Relayout( const Size& size ) +Controller::UpdateTextType Controller::Relayout( const Size& size ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::Relayout %p size %f,%f, autoScroll[%s]\n", this, size.width, size.height, (mImpl->mAutoScrollEnabled)?"true":"false" ); + UpdateTextType updateTextType = NONE_UPDATED; + if( ( size.width < Math::MACHINE_EPSILON_1000 ) || ( size.height < Math::MACHINE_EPSILON_1000 ) ) { - bool glyphsRemoved( false ); if( 0u != mImpl->mVisualModel->mGlyphPositions.Count() ) { mImpl->mVisualModel->mGlyphPositions.Clear(); - glyphsRemoved = true; + updateTextType = MODEL_UPDATED; } // Clear the update info. This info will be set the next time the text is updated. @@ -1425,7 +1399,7 @@ bool Controller::Relayout( const Size& size ) // Not worth to relayout if width or height is equal to zero. DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::Relayout (skipped)\n" ); - return glyphsRemoved; + return updateTextType; } // Whether a new size has been set. @@ -1464,6 +1438,11 @@ bool Controller::Relayout( const Size& size ) mImpl->mOperationsPending, layoutSize ) || updated; + if( updated ) + { + updateTextType = MODEL_UPDATED; + } + // Do not re-do any operation until something changes. mImpl->mOperationsPending = NO_OPERATION; @@ -1495,14 +1474,17 @@ bool Controller::Relayout( const Size& size ) } // Move the cursor, grab handle etc. - updated = mImpl->ProcessInputEvents() || updated; + if( mImpl->ProcessInputEvents() ) + { + updateTextType = static_cast( updateTextType | DECORATOR_UPDATED ); + } } // Clear the update info. This info will be set the next time the text is updated. mImpl->mTextUpdateInfo.Clear(); DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::Relayout\n" ); - return updated; + return updateTextType; } void Controller::ProcessModifyEvents() @@ -2018,9 +2000,13 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) textChanged = true; } - if( ( mImpl->mEventData->mState != EventData::INTERRUPTED ) && - ( mImpl->mEventData->mState != EventData::INACTIVE ) ) + if ( ( mImpl->mEventData->mState != EventData::INTERRUPTED ) && + ( mImpl->mEventData->mState != EventData::INACTIVE ) && + ( Dali::DALI_KEY_SHIFT_LEFT != keyCode ) ) { + // Should not change the state if the key is the shift send by the imf manager. + // Otherwise, when the state is SELECTING the text controller can't send the right + // surrounding info to the imf. mImpl->ChangeState( EventData::EDITING ); } @@ -2564,12 +2550,6 @@ void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Butt mImpl->SendSelectionToClipboard( true ); // Synchronous call to modify text mImpl->mOperationsPending = ALL_OPERATIONS; - // This is to reset the virtual keyboard to Upper-case - if( 0u == mImpl->mLogicalModel->mText.Count() ) - { - NotifyImfManager(); - } - if( ( 0u != mImpl->mLogicalModel->mText.Count() ) || !mImpl->IsPlaceholderAvailable() ) { @@ -2590,7 +2570,10 @@ void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Butt case Toolkit::TextSelectionPopup::COPY: { mImpl->SendSelectionToClipboard( false ); // Text not modified - mImpl->RequestRelayout(); // Handles, Selection Highlight, Popup + + mImpl->mEventData->mUpdateCursorPosition = true; + + mImpl->RequestRelayout(); // Cursor, Handles, Selection Highlight, Popup break; } case Toolkit::TextSelectionPopup::PASTE: @@ -2632,35 +2615,36 @@ void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Butt ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent ) { - bool update = false; + // Whether the text needs to be relaid-out. bool requestRelayout = false; - std::string text; - unsigned int cursorPosition = 0u; + // Whether to retrieve the text and cursor position to be sent to the IMF manager. + bool retrieveText = false; + bool retrieveCursor = false; switch( imfEvent.eventName ) { case ImfManager::COMMIT: { InsertText( imfEvent.predictiveString, Text::Controller::COMMIT ); - update = true; requestRelayout = true; + retrieveCursor = true; break; } case ImfManager::PREEDIT: { InsertText( imfEvent.predictiveString, Text::Controller::PRE_EDIT ); - update = true; requestRelayout = true; + retrieveCursor = true; break; } case ImfManager::DELETESURROUNDING: { - update = RemoveText( imfEvent.cursorOffset, - imfEvent.numberOfChars, - DONT_UPDATE_INPUT_STYLE ); + const bool textDeleted = RemoveText( imfEvent.cursorOffset, + imfEvent.numberOfChars, + DONT_UPDATE_INPUT_STYLE ); - if( update ) + if( textDeleted ) { if( ( 0u != mImpl->mLogicalModel->mText.Count() ) || !mImpl->IsPlaceholderAvailable() ) @@ -2673,17 +2657,15 @@ ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, cons } mImpl->mEventData->mUpdateCursorPosition = true; mImpl->mEventData->mScrollAfterDelete = true; + + requestRelayout = true; } - requestRelayout = true; break; } case ImfManager::GETSURROUNDING: { - GetText( text ); - cursorPosition = GetLogicalCursorPosition(); - - imfManager.SetSurroundingText( text ); - imfManager.SetCursorPosition( cursorPosition ); + retrieveText = true; + retrieveCursor = true; break; } case ImfManager::VOID: @@ -2693,12 +2675,6 @@ ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, cons } } // end switch - if( ImfManager::GETSURROUNDING != imfEvent.eventName ) - { - GetText( text ); - cursorPosition = GetLogicalCursorPosition(); - } - if( requestRelayout ) { mImpl->mOperationsPending = ALL_OPERATIONS; @@ -2708,7 +2684,32 @@ ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, cons mImpl->mControlInterface.TextChanged(); } - ImfManager::ImfCallbackData callbackData( update, cursorPosition, text, false ); + std::string text; + CharacterIndex cursorPosition = 0u; + Length numberOfWhiteSpaces = 0u; + + if( retrieveCursor ) + { + numberOfWhiteSpaces = mImpl->GetNumberOfWhiteSpaces( 0u ); + + cursorPosition = mImpl->GetLogicalCursorPosition(); + + if( cursorPosition < numberOfWhiteSpaces ) + { + cursorPosition = 0u; + } + else + { + cursorPosition -= numberOfWhiteSpaces; + } + } + + if( retrieveText ) + { + mImpl->GetText( numberOfWhiteSpaces, text ); + } + + ImfManager::ImfCallbackData callbackData( ( retrieveText || retrieveCursor ), cursorPosition, text, false ); return callbackData; } @@ -2746,11 +2747,6 @@ bool Controller::BackspaceKeyEvent() if( removed ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::KeyEvent %p DALI_KEY_BACKSPACE RemovedText\n", this ); - // Notifiy the IMF manager after text changed - // Automatic Upper-case and restarting prediction on an existing word require this. - NotifyImfManager(); - if( ( 0u != mImpl->mLogicalModel->mText.Count() ) || !mImpl->IsPlaceholderAvailable() ) { @@ -2767,23 +2763,6 @@ bool Controller::BackspaceKeyEvent() return removed; } -void Controller::NotifyImfManager() -{ - if( NULL != mImpl->mEventData ) - { - if( mImpl->mEventData->mImfManager ) - { - // Notifying IMF of a cursor change triggers a surrounding text request so updating it now. - std::string text; - GetText( text ); - mImpl->mEventData->mImfManager.SetSurroundingText( text ); - - mImpl->mEventData->mImfManager.SetCursorPosition( GetLogicalCursorPosition() ); - mImpl->mEventData->mImfManager.NotifyCursorPosition(); - } - } -} - void Controller::ShowPlaceholderText() { if( mImpl->IsPlaceholderAvailable() )