X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller.cpp;h=36c293e66f2fd269aaf7a20e43ae04c6851198be;hb=00fdaec1c1d0ae69756e720ac5d3bc3acc5bd2a9;hp=b32b20e8a0eb6d37718b7c7609711d69de3c1f84;hpb=26cacf71e74fab984c12bc77485920f4573b97ec;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index b32b20e..36c293e 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -68,15 +68,19 @@ namespace Text * * @param[in] eventData The event data pointer. * @param[in] logicalModel The logical model where to add the new font description run. + * @param[out] startOfSelectedText Index to the first selected character. + * @param[out] lengthOfSelectedText Number of selected characters. */ FontDescriptionRun& UpdateSelectionFontStyleRun( EventData* eventData, - LogicalModelPtr logicalModel ) + LogicalModelPtr logicalModel, + CharacterIndex& startOfSelectedText, + Length& lengthOfSelectedText ) { const bool handlesCrossed = eventData->mLeftSelectionPosition > eventData->mRightSelectionPosition; // Get start and end position of selection - const CharacterIndex startOfSelectedText = handlesCrossed ? eventData->mRightSelectionPosition : eventData->mLeftSelectionPosition; - const Length lengthOfSelectedText = ( handlesCrossed ? eventData->mLeftSelectionPosition : eventData->mRightSelectionPosition ) - startOfSelectedText; + startOfSelectedText = handlesCrossed ? eventData->mRightSelectionPosition : eventData->mLeftSelectionPosition; + lengthOfSelectedText = ( handlesCrossed ? eventData->mLeftSelectionPosition : eventData->mRightSelectionPosition ) - startOfSelectedText; // Add the font run. const VectorBase::SizeType numberOfRuns = logicalModel->mFontDescriptionRuns.Count(); @@ -115,9 +119,6 @@ void Controller::SetGlyphType( TextAbstraction::GlyphType glyphType ) // Clear the font-specific data ClearFontData(); - mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); } @@ -131,6 +132,55 @@ bool Controller::IsMarkupProcessorEnabled() const return mImpl->mMarkupProcessorEnabled; } +void Controller::SetAutoScrollEnabled( bool enable ) +{ + DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled[%s] SingleBox[%s]-> [%p]\n", (enable)?"true":"false", ( mImpl->mLayoutEngine.GetLayout() == LayoutEngine::SINGLE_LINE_BOX)?"true":"false", this ); + + if ( mImpl->mLayoutEngine.GetLayout() == LayoutEngine::SINGLE_LINE_BOX ) + { + if ( enable ) + { + DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled for SINGLE_LINE_BOX\n" ); + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | + LAYOUT | + ALIGN | + UPDATE_ACTUAL_SIZE | + UPDATE_DIRECTION | + REORDER ); + + } + else + { + DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled Disabling autoscroll\n"); + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | + LAYOUT | + ALIGN | + UPDATE_ACTUAL_SIZE | + REORDER ); + } + + mImpl->mAutoScrollEnabled = enable; + mImpl->RequestRelayout(); + } + else + { + DALI_LOG_WARNING( "Attempted AutoScrolling on a non SINGLE_LINE_BOX, request ignored" ); + mImpl->mAutoScrollEnabled = false; + } +} + +bool Controller::IsAutoScrollEnabled() const +{ + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::IsAutoScrollEnabled[%s]\n", (mImpl->mAutoScrollEnabled)?"true":"false" ); + + return mImpl->mAutoScrollEnabled; +} + +CharacterDirection Controller::GetAutoScrollDirection() const +{ + return mImpl->mAutoScrollDirectionRTL; +} + void Controller::SetText( const std::string& text ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SetText\n" ); @@ -160,6 +210,8 @@ void Controller::SetText( const std::string& text ) if( !text.empty() ) { + mImpl->mVisualModel->SetTextColor( mImpl->mTextColor ); + MarkupProcessData markupProcessData( mImpl->mLogicalModel->mColorRuns, mImpl->mLogicalModel->mFontDescriptionRuns ); @@ -322,9 +374,6 @@ void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily ) // Clear the font-specific data ClearFontData(); - mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); } @@ -371,9 +420,6 @@ void Controller::SetDefaultFontWeight( FontWeight weight ) // Clear the font-specific data ClearFontData(); - mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); } @@ -400,9 +446,6 @@ void Controller::SetDefaultFontWidth( FontWidth width ) // Clear the font-specific data ClearFontData(); - mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); } @@ -429,9 +472,6 @@ void Controller::SetDefaultFontSlant( FontSlant slant ) // Clear the font-specific data ClearFontData(); - mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); } @@ -467,9 +507,6 @@ void Controller::SetDefaultPointSize( float pointSize ) // Clear the font-specific data ClearFontData(); - mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); } @@ -485,16 +522,15 @@ float Controller::GetDefaultPointSize() const void Controller::UpdateAfterFontChange( const std::string& newDefaultFont ) { - DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::UpdateAfterFontChange"); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::UpdateAfterFontChange"); if( !mImpl->mFontDefaults->familyDefined ) // If user defined font then should not update when system font changes { DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::UpdateAfterFontChange newDefaultFont(%s)\n", newDefaultFont.c_str() ); - ClearFontData(); mImpl->mFontDefaults->mFontDescription.family = newDefaultFont; - mImpl->UpdateModel( ALL_OPERATIONS ); - mImpl->QueueModifyEvent( ModifyEvent::TEXT_REPLACED ); - mImpl->mRecalculateNaturalSize = true; + + ClearFontData(); + mImpl->RequestRelayout(); } } @@ -516,7 +552,9 @@ const Vector4& Controller::GetTextColor() const return mImpl->mTextColor; } -bool Controller::RemoveText( int cursorOffset, int numberOfCharacters ) +bool Controller::RemoveText( int cursorOffset, + int numberOfCharacters, + UpdateInputStyleType type ) { bool removed = false; @@ -555,13 +593,16 @@ bool Controller::RemoveText( int cursorOffset, int numberOfCharacters ) // Update the input style and remove the text's style before removing the text. - // Set first the default input style. - mImpl->RetrieveDefaultInputStyle( mImpl->mEventData->mInputStyle ); + if( UPDATE_INPUT_STYLE == type ) + { + // Set first the default input style. + mImpl->RetrieveDefaultInputStyle( mImpl->mEventData->mInputStyle ); - // Update the input style. - mImpl->mLogicalModel->RetrieveStyle( cursorIndex, mImpl->mEventData->mInputStyle ); + // Update the input style. + mImpl->mLogicalModel->RetrieveStyle( cursorIndex, mImpl->mEventData->mInputStyle ); + } - // Remove the text's style before removing the text. + // Updates the text style runs by removing characters. Runs with no characters are removed. mImpl->mLogicalModel->UpdateTextStyleRuns( cursorIndex, -numberOfCharacters ); // Remove the characters. @@ -670,6 +711,7 @@ void Controller::SetInputColor( const Vector4& color ) if( NULL != mImpl->mEventData ) { mImpl->mEventData->mInputStyle.textColor = color; + mImpl->mEventData->mInputStyle.isDefaultColor = false; if( EventData::SELECTING == mImpl->mEventData->mState ) { @@ -691,6 +733,10 @@ void Controller::SetInputColor( const Vector4& color ) // Request to relayout. mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | COLOR ); mImpl->RequestRelayout(); + + mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; } } } @@ -716,8 +762,12 @@ void Controller::SetInputFontFamily( const std::string& fontFamily ) if( EventData::SELECTING == mImpl->mEventData->mState ) { + CharacterIndex startOfSelectedText = 0u; + Length lengthOfSelectedText = 0u; FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mLogicalModel ); + mImpl->mLogicalModel, + startOfSelectedText, + lengthOfSelectedText ); fontDescriptionRun.familyLength = fontFamily.size(); fontDescriptionRun.familyName = new char[fontDescriptionRun.familyLength]; @@ -727,10 +777,21 @@ void Controller::SetInputFontFamily( const std::string& fontFamily ) // The memory allocated for the font family name is freed when the font description is removed from the logical model. // Request to relayout. - mImpl->mOperationsPending = ALL_OPERATIONS; + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | + VALIDATE_FONTS | + SHAPE_TEXT | + GET_GLYPH_METRICS | + LAYOUT | + UPDATE_ACTUAL_SIZE | + REORDER | + ALIGN ); mImpl->mRecalculateNaturalSize = true; mImpl->RequestRelayout(); + mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; + // As the font changes, recalculate the handle positions is needed. mImpl->mEventData->mUpdateLeftSelectionPosition = true; mImpl->mEventData->mUpdateRightSelectionPosition = true; @@ -778,17 +839,32 @@ void Controller::SetInputFontWeight( FontWeight weight ) if( EventData::SELECTING == mImpl->mEventData->mState ) { + CharacterIndex startOfSelectedText = 0u; + Length lengthOfSelectedText = 0u; FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mLogicalModel ); + mImpl->mLogicalModel, + startOfSelectedText, + lengthOfSelectedText ); fontDescriptionRun.weight = weight; fontDescriptionRun.weightDefined = true; // Request to relayout. - mImpl->mOperationsPending = ALL_OPERATIONS; + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | + VALIDATE_FONTS | + SHAPE_TEXT | + GET_GLYPH_METRICS | + LAYOUT | + UPDATE_ACTUAL_SIZE | + REORDER | + ALIGN ); mImpl->mRecalculateNaturalSize = true; mImpl->RequestRelayout(); + mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; + // As the font might change, recalculate the handle positions is needed. mImpl->mEventData->mUpdateLeftSelectionPosition = true; mImpl->mEventData->mUpdateRightSelectionPosition = true; @@ -816,17 +892,32 @@ void Controller::SetInputFontWidth( FontWidth width ) if( EventData::SELECTING == mImpl->mEventData->mState ) { + CharacterIndex startOfSelectedText = 0u; + Length lengthOfSelectedText = 0u; FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mLogicalModel ); + mImpl->mLogicalModel, + startOfSelectedText, + lengthOfSelectedText ); fontDescriptionRun.width = width; fontDescriptionRun.widthDefined = true; // Request to relayout. - mImpl->mOperationsPending = ALL_OPERATIONS; + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | + VALIDATE_FONTS | + SHAPE_TEXT | + GET_GLYPH_METRICS | + LAYOUT | + UPDATE_ACTUAL_SIZE | + REORDER | + ALIGN ); mImpl->mRecalculateNaturalSize = true; mImpl->RequestRelayout(); + mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; + // As the font might change, recalculate the handle positions is needed. mImpl->mEventData->mUpdateLeftSelectionPosition = true; mImpl->mEventData->mUpdateRightSelectionPosition = true; @@ -854,17 +945,32 @@ void Controller::SetInputFontSlant( FontSlant slant ) if( EventData::SELECTING == mImpl->mEventData->mState ) { + CharacterIndex startOfSelectedText = 0u; + Length lengthOfSelectedText = 0u; FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mLogicalModel ); + mImpl->mLogicalModel, + startOfSelectedText, + lengthOfSelectedText ); fontDescriptionRun.slant = slant; fontDescriptionRun.slantDefined = true; // Request to relayout. - mImpl->mOperationsPending = ALL_OPERATIONS; + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | + VALIDATE_FONTS | + SHAPE_TEXT | + GET_GLYPH_METRICS | + LAYOUT | + UPDATE_ACTUAL_SIZE | + REORDER | + ALIGN ); mImpl->mRecalculateNaturalSize = true; mImpl->RequestRelayout(); + mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; + // As the font might change, recalculate the handle positions is needed. mImpl->mEventData->mUpdateLeftSelectionPosition = true; mImpl->mEventData->mUpdateRightSelectionPosition = true; @@ -891,17 +997,32 @@ void Controller::SetInputFontPointSize( float size ) if( EventData::SELECTING == mImpl->mEventData->mState ) { + CharacterIndex startOfSelectedText = 0u; + Length lengthOfSelectedText = 0u; FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mLogicalModel ); + mImpl->mLogicalModel, + startOfSelectedText, + lengthOfSelectedText ); fontDescriptionRun.size = static_cast( size * 64.f ); fontDescriptionRun.sizeDefined = true; // Request to relayout. - mImpl->mOperationsPending = ALL_OPERATIONS; + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | + VALIDATE_FONTS | + SHAPE_TEXT | + GET_GLYPH_METRICS | + LAYOUT | + UPDATE_ACTUAL_SIZE | + REORDER | + ALIGN ); mImpl->mRecalculateNaturalSize = true; mImpl->RequestRelayout(); + mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; + // As the font might change, recalculate the handle positions is needed. mImpl->mEventData->mUpdateLeftSelectionPosition = true; mImpl->mEventData->mUpdateRightSelectionPosition = true; @@ -1101,7 +1222,7 @@ float Controller::GetHeightForWidth( float width ) bool Controller::Relayout( const Size& size ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::Relayout %p size %f,%f\n", this, size.width, size.height ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::Relayout %p size %f,%f, autoScroll[%s]\n", this, size.width, size.height, (mImpl->mAutoScrollEnabled)?"true":"false" ); if( ( size.width < Math::MACHINE_EPSILON_1000 ) || ( size.height < Math::MACHINE_EPSILON_1000 ) ) { @@ -1117,6 +1238,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; } @@ -1139,21 +1261,16 @@ bool Controller::Relayout( const Size& size ) } // Whether there are modify events. - const bool isModifyEventsEmpty = 0u == mImpl->mModifyEvents.Count(); - - // Make sure the model is up-to-date before layouting. - ProcessModifyEvents(); - mImpl->UpdateModel( mImpl->mOperationsPending ); - - // Style operations that need to be done if the text is modified. - if( !isModifyEventsEmpty ) + if( 0u != mImpl->mModifyEvents.Count() ) { + // Style operations that need to be done if the text is modified. mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | COLOR ); } - // Apply the style runs if text is modified. - bool updated = mImpl->UpdateModelStyle( mImpl->mOperationsPending ); + // Make sure the model is up-to-date before layouting. + ProcessModifyEvents(); + bool updated = mImpl->UpdateModel( mImpl->mOperationsPending ); // Layout the text. Size layoutSize; @@ -1194,8 +1311,8 @@ bool Controller::Relayout( const Size& size ) // 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; } @@ -1362,8 +1479,10 @@ bool Controller::DoRelayout( const Size& size, const CharacterIndex startIndex = mImpl->mTextUpdateInfo.mParagraphCharacterIndex; const Length requestedNumberOfCharacters = mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters; - if( LAYOUT & operations ) + if( NO_OPERATION != ( LAYOUT & operations ) ) { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::DoRelayout LAYOUT & operations\n"); + // Some vectors with data needed to layout and reorder may be void // after the first time the text has been laid out. // Fill the vectors again. @@ -1381,7 +1500,7 @@ bool Controller::DoRelayout( const Size& size, if( 0u == totalNumberOfGlyphs ) { - if( UPDATE_ACTUAL_SIZE & operations ) + if( NO_OPERATION != ( UPDATE_ACTUAL_SIZE & operations ) ) { mImpl->mVisualModel->SetLayoutSize( Size::ZERO ); } @@ -1432,10 +1551,16 @@ bool Controller::DoRelayout( const Size& size, mImpl->mVisualModel->mLines, layoutSize ); + if( viewUpdated ) { + if ( NO_OPERATION != ( UPDATE_DIRECTION & operations ) ) + { + mImpl->mAutoScrollDirectionRTL = false; + } + // Reorder the lines - if( REORDER & operations ) + if( NO_OPERATION != ( REORDER & operations ) ) { Vector& bidirectionalInfo = mImpl->mLogicalModel->mBidirectionalParagraphInfo; Vector& bidirectionalLineInfo = mImpl->mLogicalModel->mBidirectionalLineInfo; @@ -1458,27 +1583,25 @@ bool Controller::DoRelayout( const Size& size, layoutParameters.lineBidirectionalInfoRunsBuffer = bidirectionalLineInfo.Begin(); layoutParameters.numberOfBidirectionalInfoRuns = bidirectionalLineInfo.Count(); - // TODO: update the conversion map instead creating it from scratch. - // Note this tables store indices to characters, so update the table means modify all the indices of the text after the last updated character. - // It's better to refactor this. Store this table per line and don't update the indices. - // For the cursor position probably is better to use the function instead creating a table. - // Set the bidirectional info into the model. - mImpl->mLogicalModel->SetVisualToLogicalMap( layoutParameters.lineBidirectionalInfoRunsBuffer, - layoutParameters.numberOfBidirectionalInfoRuns, - 0u, - mImpl->mLogicalModel->mText.Count() ); - // Re-layout the text. Reorder those lines with right to left characters. mImpl->mLayoutEngine.ReLayoutRightToLeftLines( layoutParameters, startIndex, requestedNumberOfCharacters, glyphPositions ); + if ( ( NO_OPERATION != ( UPDATE_DIRECTION & operations ) ) && ( numberOfLines > 0 ) ) + { + const LineRun* const firstline = mImpl->mVisualModel->mLines.Begin(); + if ( firstline ) + { + mImpl->mAutoScrollDirectionRTL = firstline->direction; + } + } } } // REORDER // Sets the actual size. - if( UPDATE_ACTUAL_SIZE & operations ) + if( NO_OPERATION != ( UPDATE_ACTUAL_SIZE & operations ) ) { mImpl->mVisualModel->SetLayoutSize( layoutSize ); } @@ -1492,7 +1615,7 @@ bool Controller::DoRelayout( const Size& size, layoutSize = mImpl->mVisualModel->GetLayoutSize(); } - if( ALIGN & operations ) + if( NO_OPERATION != ( ALIGN & operations ) ) { // The laid-out lines. Vector& lines = mImpl->mVisualModel->mLines; @@ -1504,7 +1627,11 @@ bool Controller::DoRelayout( const Size& size, viewUpdated = true; } - +#if defined(DEBUG_ENABLED) + std::string currentText; + GetText( currentText ); + DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::DoRelayout [%p] mImpl->mAutoScrollDirectionRTL[%s] [%s]\n", this, (mImpl->mAutoScrollDirectionRTL)?"true":"false", currentText.c_str() ); +#endif DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::DoRelayout, view updated %s\n", ( viewUpdated ? "true" : "false" ) ); return viewUpdated; } @@ -1812,7 +1939,9 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ { const CharacterIndex offset = mImpl->mEventData->mPrimaryCursorPosition - mImpl->mEventData->mPreEditStartPosition; - removedPrevious = RemoveText( -static_cast( offset ), mImpl->mEventData->mPreEditLength ); + removedPrevious = RemoveText( -static_cast( offset ), + mImpl->mEventData->mPreEditLength, + DONT_UPDATE_INPUT_STYLE ); mImpl->mEventData->mPrimaryCursorPosition = mImpl->mEventData->mPreEditStartPosition; mImpl->mEventData->mPreEditLength = 0u; @@ -1891,10 +2020,11 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ // Retrieve the text's style for the given index. InputStyle style; + mImpl->RetrieveDefaultInputStyle( style ); mImpl->mLogicalModel->RetrieveStyle( styleIndex, style ); // Whether to add a new text color run. - const bool addColorRun = style.textColor != mImpl->mEventData->mInputStyle.textColor; + const bool addColorRun = ( style.textColor != mImpl->mEventData->mInputStyle.textColor ); // Whether to add a new font run. const bool addFontNameRun = style.familyName != mImpl->mEventData->mInputStyle.familyName; @@ -2044,10 +2174,10 @@ void Controller::TapEvent( unsigned int tapCount, float x, float y ) // This is to avoid unnecessary relayouts when tapping an empty text-field bool relayoutNeeded( false ); - if( ( EventData::EDITING_WITH_PASTE_POPUP == mImpl->mEventData->mState ) || + if( ( EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState ) || ( EventData::EDITING_WITH_PASTE_POPUP == mImpl->mEventData->mState ) ) { - mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE); // If Popup shown hide it here so can be shown again if required. + mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE ); // If Popup shown hide it here so can be shown again if required. } if( mImpl->IsShowingRealText() && ( EventData::INACTIVE != mImpl->mEventData->mState ) ) @@ -2274,8 +2404,13 @@ void Controller::PasteClipboardItemEvent() // Commit the current pre-edit text; the contents of the clipboard should be appended mImpl->ResetImfManager(); + // Temporary disable hiding clipboard + mImpl->SetClipboardHideEnable( false ); + // Paste PasteText( stringToPaste ); + + mImpl->SetClipboardHideEnable( true ); } void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Buttons button ) @@ -2381,7 +2516,9 @@ ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, cons } case ImfManager::DELETESURROUNDING: { - update = RemoveText( imfEvent.cursorOffset, imfEvent.numberOfChars ); + update = RemoveText( imfEvent.cursorOffset, + imfEvent.numberOfChars, + DONT_UPDATE_INPUT_STYLE ); if( update ) { @@ -2461,7 +2598,9 @@ bool Controller::BackspaceKeyEvent() else if( mImpl->mEventData->mPrimaryCursorPosition > 0 ) { // Remove the character before the current cursor position - removed = RemoveText( -1, 1 ); + removed = RemoveText( -1, + 1, + UPDATE_INPUT_STYLE ); } if( removed ) @@ -2579,15 +2718,24 @@ void Controller::ClearFontData() { mImpl->mFontDefaults->mFontId = 0u; // Remove old font ID } - mImpl->mLogicalModel->mFontRuns.Clear(); - mImpl->mVisualModel->mGlyphs.Clear(); - mImpl->mVisualModel->mGlyphsToCharacters.Clear(); - mImpl->mVisualModel->mCharactersToGlyph.Clear(); - mImpl->mVisualModel->mCharactersPerGlyph.Clear(); - mImpl->mVisualModel->mGlyphsPerCharacter.Clear(); - mImpl->mVisualModel->mGlyphPositions.Clear(); - mImpl->mVisualModel->mLines.Clear(); - mImpl->mVisualModel->ClearCaches(); + + // Set flags to update the model. + mImpl->mTextUpdateInfo.mCharacterIndex = 0u; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mLogicalModel->mText.Count(); + + mImpl->mTextUpdateInfo.mClearAll = true; + mImpl->mTextUpdateInfo.mFullRelayoutNeeded = true; + mImpl->mRecalculateNaturalSize = true; + + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | + VALIDATE_FONTS | + SHAPE_TEXT | + GET_GLYPH_METRICS | + LAYOUT | + UPDATE_ACTUAL_SIZE | + REORDER | + ALIGN ); } void Controller::ClearStyleData()