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=47de1a26de606b326db6cdb4dedb41a816172c04;hp=e990d42f722319d20eb2a5b06cbb17f53e6bc2ea;hb=refs%2Fchanges%2F24%2F76824%2F3;hpb=f39a0555fc2897d94a4984712e219e452bc96d70 diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index e990d42..47de1a2 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -20,6 +20,7 @@ // EXTERNAL INCLUDES #include +#include #include #include #include @@ -28,6 +29,7 @@ #include #include #include +#include #include namespace @@ -38,10 +40,8 @@ namespace #endif const float MAX_FLOAT = std::numeric_limits::max(); -const unsigned int POINTS_PER_INCH = 72; const std::string EMPTY_STRING(""); -const unsigned int ZERO = 0u; float ConvertToEven( float value ) { @@ -60,6 +60,43 @@ namespace Toolkit namespace Text { +/** + * @brief Adds a new font description run for the selected text. + * + * The new font parameters are added after the call to this method. + * + * @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, + CharacterIndex& startOfSelectedText, + Length& lengthOfSelectedText ) +{ + const bool handlesCrossed = eventData->mLeftSelectionPosition > eventData->mRightSelectionPosition; + + // Get start and end position of selection + startOfSelectedText = handlesCrossed ? eventData->mRightSelectionPosition : eventData->mLeftSelectionPosition; + lengthOfSelectedText = ( handlesCrossed ? eventData->mLeftSelectionPosition : eventData->mRightSelectionPosition ) - startOfSelectedText; + + // Add the font run. + const VectorBase::SizeType numberOfRuns = logicalModel->mFontDescriptionRuns.Count(); + logicalModel->mFontDescriptionRuns.Resize( numberOfRuns + 1u ); + + FontDescriptionRun& fontDescriptionRun = *( logicalModel->mFontDescriptionRuns.Begin() + numberOfRuns ); + + fontDescriptionRun.characterRun.characterIndex = startOfSelectedText; + fontDescriptionRun.characterRun.numberOfCharacters = lengthOfSelectedText; + + // Recalculate the selection highlight as the metrics may have changed. + eventData->mUpdateLeftSelectionPosition = true; + eventData->mUpdateRightSelectionPosition = true; + + return fontDescriptionRun; +} + ControllerPtr Controller::New( ControlInterface& controlInterface ) { return ControllerPtr( new Controller( controlInterface ) ); @@ -67,12 +104,95 @@ ControllerPtr Controller::New( ControlInterface& controlInterface ) void Controller::EnableTextInput( DecoratorPtr decorator ) { - if( !mImpl->mEventData ) + if( NULL == mImpl->mEventData ) { mImpl->mEventData = new EventData( decorator ); } } +void Controller::SetGlyphType( TextAbstraction::GlyphType glyphType ) +{ + // Metrics for bitmap & vector based glyphs are different + mImpl->mMetrics->SetGlyphType( glyphType ); + + // Clear the font-specific data + ClearFontData(); + + mImpl->RequestRelayout(); +} + +void Controller::SetMarkupProcessorEnabled( bool enable ) +{ + mImpl->mMarkupProcessorEnabled = enable; +} + +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; +} + +float Controller::GetAutoScrollLineAlignment() const +{ + float offset = 0.f; + + if( mImpl->mVisualModel && + ( 0u != mImpl->mVisualModel->mLines.Count() ) ) + { + offset = ( *mImpl->mVisualModel->mLines.Begin() ).alignmentOffset; + } + + return offset; +} + void Controller::SetText( const std::string& text ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SetText\n" ); @@ -80,17 +200,21 @@ void Controller::SetText( const std::string& text ) // Reset keyboard as text changed mImpl->ResetImfManager(); - // Remove the previously set text + // Remove the previously set text and style. ResetText(); + // Remove the style. + ClearStyleData(); + CharacterIndex lastCursorIndex = 0u; - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { // If popup shown then hide it by switching to Editing state if( ( EventData::SELECTING == mImpl->mEventData->mState ) || ( EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState ) || - ( EventData::EDITING_WITH_GRAB_HANDLE == mImpl->mEventData->mState ) ) + ( EventData::EDITING_WITH_GRAB_HANDLE == mImpl->mEventData->mState ) || + ( EventData::EDITING_WITH_PASTE_POPUP == mImpl->mEventData->mState ) ) { mImpl->ChangeState( EventData::EDITING ); } @@ -98,20 +222,43 @@ void Controller::SetText( const std::string& text ) if( !text.empty() ) { + mImpl->mVisualModel->SetTextColor( mImpl->mTextColor ); + + MarkupProcessData markupProcessData( mImpl->mLogicalModel->mColorRuns, + mImpl->mLogicalModel->mFontDescriptionRuns ); + + Length textSize = 0u; + const uint8_t* utf8 = NULL; + if( mImpl->mMarkupProcessorEnabled ) + { + ProcessMarkupString( text, markupProcessData ); + textSize = markupProcessData.markupProcessedText.size(); + + // This is a bit horrible but std::string returns a (signed) char* + utf8 = reinterpret_cast( markupProcessData.markupProcessedText.c_str() ); + } + else + { + textSize = text.size(); + + // This is a bit horrible but std::string returns a (signed) char* + utf8 = reinterpret_cast( text.c_str() ); + } + // Convert text into UTF-32 Vector& utf32Characters = mImpl->mLogicalModel->mText; - utf32Characters.Resize( text.size() ); - - // This is a bit horrible but std::string returns a (signed) char* - const uint8_t* utf8 = reinterpret_cast( text.c_str() ); + utf32Characters.Resize( textSize ); // Transform a text array encoded in utf8 into an array encoded in utf32. // It returns the actual number of characters. - Length characterCount = Utf8ToUtf32( utf8, text.size(), utf32Characters.Begin() ); + Length characterCount = Utf8ToUtf32( utf8, textSize, utf32Characters.Begin() ); utf32Characters.Resize( characterCount ); - DALI_ASSERT_DEBUG( text.size() >= characterCount && "Invalid UTF32 conversion length" ); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SetText %p UTF8 size %d, UTF32 size %d\n", this, text.size(), mImpl->mLogicalModel->mText.Count() ); + DALI_ASSERT_DEBUG( textSize >= characterCount && "Invalid UTF32 conversion length" ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SetText %p UTF8 size %d, UTF32 size %d\n", this, textSize, mImpl->mLogicalModel->mText.Count() ); + + // The characters to be added. + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mLogicalModel->mText.Count(); // To reset the cursor position lastCursorIndex = characterCount; @@ -138,29 +285,22 @@ void Controller::SetText( const std::string& text ) mImpl->RequestRelayout(); - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { // Cancel previously queued events mImpl->mEventData->mEventQueue.clear(); } - // Notify IMF as text changed - NotifyImfManager(); - // Do this last since it provides callbacks into application code mImpl->mControlInterface.TextChanged(); } void Controller::GetText( std::string& text ) const { - if( ! mImpl->IsShowingPlaceholderText() ) + 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 { @@ -168,19 +308,9 @@ void Controller::GetText( std::string& text ) const } } -unsigned int Controller::GetLogicalCursorPosition() const -{ - if( mImpl->mEventData ) - { - return mImpl->mEventData->mPrimaryCursorPosition; - } - - return 0u; -} - void Controller::SetPlaceholderText( PlaceholderType type, const std::string& text ) { - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { if( PLACEHOLDER_TYPE_INACTIVE == type ) { @@ -193,7 +323,7 @@ void Controller::SetPlaceholderText( PlaceholderType type, const std::string& te // Update placeholder if there is no text if( mImpl->IsShowingPlaceholderText() || - 0u == mImpl->mLogicalModel->mText.Count() ) + ( 0u == mImpl->mLogicalModel->mText.Count() ) ) { ShowPlaceholderText(); } @@ -202,7 +332,7 @@ void Controller::SetPlaceholderText( PlaceholderType type, const std::string& te void Controller::GetPlaceholderText( PlaceholderType type, std::string& text ) const { - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { if( PLACEHOLDER_TYPE_INACTIVE == type ) { @@ -215,12 +345,9 @@ void Controller::GetPlaceholderText( PlaceholderType type, std::string& text ) c } } -void Controller::SetMaximumNumberOfCharacters( int maxCharacters ) +void Controller::SetMaximumNumberOfCharacters( Length maxCharacters ) { - if ( maxCharacters >= 0 ) - { - mImpl->mMaximumNumberOfCharacters = maxCharacters; - } + mImpl->mMaximumNumberOfCharacters = maxCharacters; } int Controller::GetMaximumNumberOfCharacters() @@ -230,27 +357,24 @@ int Controller::GetMaximumNumberOfCharacters() void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily ) { - if( !mImpl->mFontDefaults ) + if( NULL == mImpl->mFontDefaults ) { mImpl->mFontDefaults = new FontDefaults(); } mImpl->mFontDefaults->mFontDescription.family = defaultFontFamily; DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetDefaultFontFamily %s\n", defaultFontFamily.c_str()); - mImpl->mUserDefinedFontFamily = true; + mImpl->mFontDefaults->familyDefined = true; // Clear the font-specific data ClearFontData(); - mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); } const std::string& Controller::GetDefaultFontFamily() const { - if( mImpl->mFontDefaults ) + if( NULL != mImpl->mFontDefaults ) { return mImpl->mFontDefaults->mFontDescription.family; } @@ -260,7 +384,7 @@ const std::string& Controller::GetDefaultFontFamily() const void Controller::SetDefaultFontStyle( const std::string& style ) { - if( !mImpl->mFontDefaults ) + if( NULL == mImpl->mFontDefaults ) { mImpl->mFontDefaults = new FontDefaults(); } @@ -270,7 +394,7 @@ void Controller::SetDefaultFontStyle( const std::string& style ) const std::string& Controller::GetDefaultFontStyle() const { - if( mImpl->mFontDefaults ) + if( NULL != mImpl->mFontDefaults ) { return mImpl->mFontDefaults->mFontStyle; } @@ -278,83 +402,77 @@ const std::string& Controller::GetDefaultFontStyle() const return EMPTY_STRING; } -void Controller::SetDefaultFontWidth( FontWidth width ) +void Controller::SetDefaultFontWeight( FontWeight weight ) { - if( !mImpl->mFontDefaults ) + if( NULL == mImpl->mFontDefaults ) { mImpl->mFontDefaults = new FontDefaults(); } - mImpl->mFontDefaults->mFontDescription.width = width; + mImpl->mFontDefaults->mFontDescription.weight = weight; + mImpl->mFontDefaults->weightDefined = true; // Clear the font-specific data ClearFontData(); - mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); } -FontWidth Controller::GetDefaultFontWidth() const +FontWeight Controller::GetDefaultFontWeight() const { - if( mImpl->mFontDefaults ) + if( NULL != mImpl->mFontDefaults ) { - return mImpl->mFontDefaults->mFontDescription.width; + return mImpl->mFontDefaults->mFontDescription.weight; } - return TextAbstraction::FontWidth::NORMAL; + return TextAbstraction::FontWeight::NORMAL; } -void Controller::SetDefaultFontWeight( FontWeight weight ) +void Controller::SetDefaultFontWidth( FontWidth width ) { - if( !mImpl->mFontDefaults ) + if( NULL == mImpl->mFontDefaults ) { mImpl->mFontDefaults = new FontDefaults(); } - mImpl->mFontDefaults->mFontDescription.weight = weight; + mImpl->mFontDefaults->mFontDescription.width = width; + mImpl->mFontDefaults->widthDefined = true; // Clear the font-specific data ClearFontData(); - mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); } -FontWeight Controller::GetDefaultFontWeight() const +FontWidth Controller::GetDefaultFontWidth() const { - if( mImpl->mFontDefaults ) + if( NULL != mImpl->mFontDefaults ) { - return mImpl->mFontDefaults->mFontDescription.weight; + return mImpl->mFontDefaults->mFontDescription.width; } - return TextAbstraction::FontWeight::NORMAL; + return TextAbstraction::FontWidth::NORMAL; } void Controller::SetDefaultFontSlant( FontSlant slant ) { - if( !mImpl->mFontDefaults ) + if( NULL == mImpl->mFontDefaults ) { mImpl->mFontDefaults = new FontDefaults(); } mImpl->mFontDefaults->mFontDescription.slant = slant; + mImpl->mFontDefaults->slantDefined = true; // Clear the font-specific data ClearFontData(); - mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); } FontSlant Controller::GetDefaultFontSlant() const { - if( mImpl->mFontDefaults ) + if( NULL != mImpl->mFontDefaults ) { return mImpl->mFontDefaults->mFontDescription.slant; } @@ -364,34 +482,23 @@ FontSlant Controller::GetDefaultFontSlant() const void Controller::SetDefaultPointSize( float pointSize ) { - if( !mImpl->mFontDefaults ) + if( NULL == mImpl->mFontDefaults ) { mImpl->mFontDefaults = new FontDefaults(); } mImpl->mFontDefaults->mDefaultPointSize = pointSize; - - 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 ); + mImpl->mFontDefaults->sizeDefined = true; // Clear the font-specific data ClearFontData(); - mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); } float Controller::GetDefaultPointSize() const { - if( mImpl->mFontDefaults ) + if( NULL != mImpl->mFontDefaults ) { return mImpl->mFontDefaults->mDefaultPointSize; } @@ -399,18 +506,17 @@ float Controller::GetDefaultPointSize() const return 0.0f; } -void Controller::UpdateAfterFontChange( std::string& newDefaultFont ) +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->mUserDefinedFontFamily ) // If user defined font then should not update when system font changes + 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(); } } @@ -432,12 +538,19 @@ const Vector4& Controller::GetTextColor() const return mImpl->mTextColor; } -bool Controller::RemoveText( int cursorOffset, int numberOfChars ) +bool Controller::RemoveText( int cursorOffset, + int numberOfCharacters, + UpdateInputStyleType type ) { - bool removed( false ); + bool removed = false; + + if( NULL == mImpl->mEventData ) + { + return removed; + } - DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::RemoveText %p mText.Count() %d cursor %d cursorOffset %d numberOfChars %d\n", - this, mImpl->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition, cursorOffset, numberOfChars ); + DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::RemoveText %p mText.Count() %d cursor %d cursorOffset %d numberOfCharacters %d\n", + this, mImpl->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition, cursorOffset, numberOfCharacters ); if( !mImpl->IsShowingPlaceholderText() ) { @@ -453,22 +566,43 @@ bool Controller::RemoveText( int cursorOffset, int numberOfChars ) cursorIndex = oldCursorIndex + cursorOffset; } - if( (cursorIndex + numberOfChars) > currentText.Count() ) + if( ( cursorIndex + numberOfCharacters ) > currentText.Count() ) { - numberOfChars = currentText.Count() - cursorIndex; + numberOfCharacters = currentText.Count() - cursorIndex; } - if( (cursorIndex + numberOfChars) <= currentText.Count() ) + if( ( cursorIndex + numberOfCharacters ) <= mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters ) { + // Mark the paragraphs to be updated. + mImpl->mTextUpdateInfo.mCharacterIndex = std::min( cursorIndex, mImpl->mTextUpdateInfo.mCharacterIndex ); + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove += numberOfCharacters; + + // Update the input style and remove the text's style before removing the text. + + 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 ); + } + + // Updates the text style runs by removing characters. Runs with no characters are removed. + mImpl->mLogicalModel->UpdateTextStyleRuns( cursorIndex, -numberOfCharacters ); + + // Remove the characters. Vector::Iterator first = currentText.Begin() + cursorIndex; - Vector::Iterator last = first + numberOfChars; + Vector::Iterator last = first + numberOfCharacters; currentText.Erase( first, last ); // Cursor position retreat oldCursorIndex = cursorIndex; - DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::RemoveText %p removed %d\n", this, numberOfChars ); + mImpl->mEventData->mScrollAfterDelete = true; + + DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::RemoveText %p removed %d\n", this, numberOfCharacters ); removed = true; } } @@ -478,7 +612,7 @@ bool Controller::RemoveText( int cursorOffset, int numberOfChars ) void Controller::SetPlaceholderTextColor( const Vector4& textColor ) { - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { mImpl->mEventData->mPlaceholderTextColor = textColor; } @@ -492,7 +626,7 @@ void Controller::SetPlaceholderTextColor( const Vector4& textColor ) const Vector4& Controller::GetPlaceholderTextColor() const { - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { return mImpl->mEventData->mPlaceholderTextColor; } @@ -524,6 +658,26 @@ const Vector4& Controller::GetShadowColor() const return mImpl->mVisualModel->GetShadowColor(); } +void Controller::SetDefaultShadowProperties( const std::string& shadowProperties ) +{ + if( NULL == mImpl->mShadowDefaults ) + { + mImpl->mShadowDefaults = new ShadowDefaults(); + } + + mImpl->mShadowDefaults->properties = shadowProperties; +} + +const std::string& Controller::GetDefaultShadowProperties() const +{ + if( NULL != mImpl->mShadowDefaults ) + { + return mImpl->mShadowDefaults->properties; + } + + return EMPTY_STRING; +} + void Controller::SetUnderlineColor( const Vector4& color ) { mImpl->mVisualModel->SetUnderlineColor( color ); @@ -560,11 +714,508 @@ float Controller::GetUnderlineHeight() const return mImpl->mVisualModel->GetUnderlineHeight(); } +void Controller::SetDefaultUnderlineProperties( const std::string& underlineProperties ) +{ + if( NULL == mImpl->mUnderlineDefaults ) + { + mImpl->mUnderlineDefaults = new UnderlineDefaults(); + } + + mImpl->mUnderlineDefaults->properties = underlineProperties; +} + +const std::string& Controller::GetDefaultUnderlineProperties() const +{ + if( NULL != mImpl->mUnderlineDefaults ) + { + return mImpl->mUnderlineDefaults->properties; + } + + return EMPTY_STRING; +} + +void Controller::SetDefaultEmbossProperties( const std::string& embossProperties ) +{ + if( NULL == mImpl->mEmbossDefaults ) + { + mImpl->mEmbossDefaults = new EmbossDefaults(); + } + + mImpl->mEmbossDefaults->properties = embossProperties; +} + +const std::string& Controller::GetDefaultEmbossProperties() const +{ + if( NULL != mImpl->mEmbossDefaults ) + { + return mImpl->mEmbossDefaults->properties; + } + + return EMPTY_STRING; +} + +void Controller::SetDefaultOutlineProperties( const std::string& outlineProperties ) +{ + if( NULL == mImpl->mOutlineDefaults ) + { + mImpl->mOutlineDefaults = new OutlineDefaults(); + } + + mImpl->mOutlineDefaults->properties = outlineProperties; +} + +const std::string& Controller::GetDefaultOutlineProperties() const +{ + if( NULL != mImpl->mOutlineDefaults ) + { + return mImpl->mOutlineDefaults->properties; + } + + return EMPTY_STRING; +} + +void Controller::SetDefaultLineSpacing( float lineSpacing ) +{ + //TODO finish implementation + mImpl->mLayoutEngine.SetDefaultLineSpacing( lineSpacing ); +} + +float Controller::GetDefaultLineSpacing() const +{ + return mImpl->mLayoutEngine.GetDefaultLineSpacing(); +} + +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 ) + { + const bool handlesCrossed = mImpl->mEventData->mLeftSelectionPosition > mImpl->mEventData->mRightSelectionPosition; + + // Get start and end position of selection + const CharacterIndex startOfSelectedText = handlesCrossed ? mImpl->mEventData->mRightSelectionPosition : mImpl->mEventData->mLeftSelectionPosition; + const Length lengthOfSelectedText = ( handlesCrossed ? mImpl->mEventData->mLeftSelectionPosition : mImpl->mEventData->mRightSelectionPosition ) - startOfSelectedText; + + // Add the color run. + const VectorBase::SizeType numberOfRuns = mImpl->mLogicalModel->mColorRuns.Count(); + mImpl->mLogicalModel->mColorRuns.Resize( numberOfRuns + 1u ); + + ColorRun& colorRun = *( mImpl->mLogicalModel->mColorRuns.Begin() + numberOfRuns ); + colorRun.color = color; + colorRun.characterRun.characterIndex = startOfSelectedText; + colorRun.characterRun.numberOfCharacters = lengthOfSelectedText; + + // Request to relayout. + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | COLOR ); + mImpl->RequestRelayout(); + + mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; + } + } +} + +const Vector4& Controller::GetInputColor() const +{ + if( NULL != mImpl->mEventData ) + { + return mImpl->mEventData->mInputStyle.textColor; + } + + // Return the default text's color if there is no EventData. + return mImpl->mTextColor; + +} + +void Controller::SetInputFontFamily( const std::string& fontFamily ) +{ + if( NULL != mImpl->mEventData ) + { + mImpl->mEventData->mInputStyle.familyName = fontFamily; + mImpl->mEventData->mInputStyle.familyDefined = true; + + if( EventData::SELECTING == mImpl->mEventData->mState ) + { + CharacterIndex startOfSelectedText = 0u; + Length lengthOfSelectedText = 0u; + FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, + mImpl->mLogicalModel, + startOfSelectedText, + lengthOfSelectedText ); + + fontDescriptionRun.familyLength = fontFamily.size(); + fontDescriptionRun.familyName = new char[fontDescriptionRun.familyLength]; + memcpy( fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength ); + fontDescriptionRun.familyDefined = true; + + // 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 = 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; + mImpl->mEventData->mScrollAfterUpdatePosition = true; + } + } +} + +const std::string& Controller::GetInputFontFamily() const +{ + if( NULL != mImpl->mEventData ) + { + return mImpl->mEventData->mInputStyle.familyName; + } + + // Return the default font's family if there is no EventData. + return GetDefaultFontFamily(); +} + +void Controller::SetInputFontStyle( const std::string& fontStyle ) +{ + if( NULL != mImpl->mEventData ) + { + mImpl->mEventData->mInputStyle.fontStyle = fontStyle; + } +} + +const std::string& Controller::GetInputFontStyle() const +{ + if( NULL != mImpl->mEventData ) + { + return mImpl->mEventData->mInputStyle.fontStyle; + } + + // Return the default font's style if there is no EventData. + return GetDefaultFontStyle(); +} + +void Controller::SetInputFontWeight( FontWeight weight ) +{ + if( NULL != mImpl->mEventData ) + { + mImpl->mEventData->mInputStyle.weight = weight; + mImpl->mEventData->mInputStyle.weightDefined = true; + + if( EventData::SELECTING == mImpl->mEventData->mState ) + { + CharacterIndex startOfSelectedText = 0u; + Length lengthOfSelectedText = 0u; + FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, + mImpl->mLogicalModel, + startOfSelectedText, + lengthOfSelectedText ); + + fontDescriptionRun.weight = weight; + fontDescriptionRun.weightDefined = true; + + // Request to relayout. + 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; + mImpl->mEventData->mScrollAfterUpdatePosition = true; + } + } +} + +FontWeight Controller::GetInputFontWeight() const +{ + if( NULL != mImpl->mEventData ) + { + return mImpl->mEventData->mInputStyle.weight; + } + + return GetDefaultFontWeight(); +} + +void Controller::SetInputFontWidth( FontWidth width ) +{ + if( NULL != mImpl->mEventData ) + { + mImpl->mEventData->mInputStyle.width = width; + mImpl->mEventData->mInputStyle.widthDefined = true; + + if( EventData::SELECTING == mImpl->mEventData->mState ) + { + CharacterIndex startOfSelectedText = 0u; + Length lengthOfSelectedText = 0u; + FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, + mImpl->mLogicalModel, + startOfSelectedText, + lengthOfSelectedText ); + + fontDescriptionRun.width = width; + fontDescriptionRun.widthDefined = true; + + // Request to relayout. + 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; + mImpl->mEventData->mScrollAfterUpdatePosition = true; + } + } +} + +FontWidth Controller::GetInputFontWidth() const +{ + if( NULL != mImpl->mEventData ) + { + return mImpl->mEventData->mInputStyle.width; + } + + return GetDefaultFontWidth(); +} + +void Controller::SetInputFontSlant( FontSlant slant ) +{ + if( NULL != mImpl->mEventData ) + { + mImpl->mEventData->mInputStyle.slant = slant; + mImpl->mEventData->mInputStyle.slantDefined = true; + + if( EventData::SELECTING == mImpl->mEventData->mState ) + { + CharacterIndex startOfSelectedText = 0u; + Length lengthOfSelectedText = 0u; + FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, + mImpl->mLogicalModel, + startOfSelectedText, + lengthOfSelectedText ); + + fontDescriptionRun.slant = slant; + fontDescriptionRun.slantDefined = true; + + // Request to relayout. + 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; + mImpl->mEventData->mScrollAfterUpdatePosition = true; + } + } +} + +FontSlant Controller::GetInputFontSlant() const +{ + if( NULL != mImpl->mEventData ) + { + return mImpl->mEventData->mInputStyle.slant; + } + + return GetDefaultFontSlant(); +} + +void Controller::SetInputFontPointSize( float size ) +{ + if( NULL != mImpl->mEventData ) + { + mImpl->mEventData->mInputStyle.size = size; + + if( EventData::SELECTING == mImpl->mEventData->mState ) + { + CharacterIndex startOfSelectedText = 0u; + Length lengthOfSelectedText = 0u; + FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, + mImpl->mLogicalModel, + startOfSelectedText, + lengthOfSelectedText ); + + fontDescriptionRun.size = static_cast( size * 64.f ); + fontDescriptionRun.sizeDefined = true; + + // Request to relayout. + 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; + mImpl->mEventData->mScrollAfterUpdatePosition = true; + } + } +} + +float Controller::GetInputFontPointSize() const +{ + if( NULL != mImpl->mEventData ) + { + return mImpl->mEventData->mInputStyle.size; + } + + // Return the default font's point size if there is no EventData. + return GetDefaultPointSize(); +} + +void Controller::SetInputLineSpacing( float lineSpacing ) +{ + if( NULL != mImpl->mEventData ) + { + mImpl->mEventData->mInputStyle.lineSpacing = lineSpacing; + } +} + +float Controller::GetInputLineSpacing() const +{ + if( NULL != mImpl->mEventData ) + { + return mImpl->mEventData->mInputStyle.lineSpacing; + } + + return 0.f; +} + +void Controller::SetInputShadowProperties( const std::string& shadowProperties ) +{ + if( NULL != mImpl->mEventData ) + { + mImpl->mEventData->mInputStyle.shadowProperties = shadowProperties; + } +} + +const std::string& Controller::GetInputShadowProperties() const +{ + if( NULL != mImpl->mEventData ) + { + return mImpl->mEventData->mInputStyle.shadowProperties; + } + + return GetDefaultShadowProperties(); +} + +void Controller::SetInputUnderlineProperties( const std::string& underlineProperties ) +{ + if( NULL != mImpl->mEventData ) + { + mImpl->mEventData->mInputStyle.underlineProperties = underlineProperties; + } +} + +const std::string& Controller::GetInputUnderlineProperties() const +{ + if( NULL != mImpl->mEventData ) + { + return mImpl->mEventData->mInputStyle.underlineProperties; + } + + return GetDefaultUnderlineProperties(); +} + +void Controller::SetInputEmbossProperties( const std::string& embossProperties ) +{ + if( NULL != mImpl->mEventData ) + { + mImpl->mEventData->mInputStyle.embossProperties = embossProperties; + } +} + +const std::string& Controller::GetInputEmbossProperties() const +{ + if( NULL != mImpl->mEventData ) + { + return mImpl->mEventData->mInputStyle.embossProperties; + } + + return GetDefaultEmbossProperties(); +} + +void Controller::SetInputOutlineProperties( const std::string& outlineProperties ) +{ + if( NULL != mImpl->mEventData ) + { + mImpl->mEventData->mInputStyle.outlineProperties = outlineProperties; + } +} + +const std::string& Controller::GetInputOutlineProperties() const +{ + if( NULL != mImpl->mEventData ) + { + return mImpl->mEventData->mInputStyle.outlineProperties; + } + + return GetDefaultOutlineProperties(); +} + void Controller::SetEnableCursorBlink( bool enable ) { DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "TextInput disabled" ); - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { mImpl->mEventData->mCursorBlinkEnabled = enable; @@ -578,7 +1229,7 @@ void Controller::SetEnableCursorBlink( bool enable ) bool Controller::GetEnableCursorBlink() const { - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { return mImpl->mEventData->mCursorBlinkEnabled; } @@ -588,17 +1239,7 @@ bool Controller::GetEnableCursorBlink() const const Vector2& Controller::GetScrollPosition() const { - if( mImpl->mEventData ) - { - return mImpl->mEventData->mScrollPosition; - } - - return Vector2::ZERO; -} - -const Vector2& Controller::GetAlignmentOffset() const -{ - return mImpl->mAlignmentOffset; + return mImpl->mScrollPosition; } Vector3 Controller::GetNaturalSize() @@ -623,20 +1264,28 @@ Vector3 Controller::GetNaturalSize() // Make sure the model is up-to-date before layouting mImpl->UpdateModel( onlyOnceOperations ); - // Operations that need to be done if the size changes. - const OperationsMask sizeOperations = static_cast( LAYOUT | - ALIGN | - REORDER ); + // Layout the text for the new width. + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | LAYOUT ); + + // Set the update info to relayout the whole text. + mImpl->mTextUpdateInfo.mParagraphCharacterIndex = 0u; + mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters = mImpl->mLogicalModel->mText.Count(); + + // Store the actual control's size to restore later. + const Size actualControlSize = mImpl->mVisualModel->mControlSize; DoRelayout( Size( MAX_FLOAT, MAX_FLOAT ), static_cast( onlyOnceOperations | - sizeOperations ), + LAYOUT ), naturalSize.GetVectorXY() ); // Do not do again the only once operations. mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending & ~onlyOnceOperations ); // Do the size related operations again. + const OperationsMask sizeOperations = static_cast( LAYOUT | + ALIGN | + REORDER ); mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | sizeOperations ); // Stores the natural size to avoid recalculate it again @@ -645,6 +1294,12 @@ Vector3 Controller::GetNaturalSize() mImpl->mRecalculateNaturalSize = false; + // Clear the update info. This info will be set the next time the text is updated. + mImpl->mTextUpdateInfo.Clear(); + + // Restore the actual control's size. + mImpl->mVisualModel->mControlSize = actualControlSize; + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetNaturalSize calculated %f,%f,%f\n", naturalSize.x, naturalSize.y, naturalSize.z ); } else @@ -667,7 +1322,7 @@ float Controller::GetHeightForWidth( float width ) ProcessModifyEvents(); Size layoutSize; - if( width != mImpl->mVisualModel->mControlSize.width ) + if( fabsf( width - mImpl->mVisualModel->mControlSize.width ) > Math::MACHINE_EPSILON_1000 ) { // Operations that can be done only once until the text changes. const OperationsMask onlyOnceOperations = static_cast( CONVERT_TO_UTF32 | @@ -681,26 +1336,43 @@ float Controller::GetHeightForWidth( float width ) // Make sure the model is up-to-date before layouting mImpl->UpdateModel( onlyOnceOperations ); - // Operations that need to be done if the size changes. - const OperationsMask sizeOperations = static_cast( LAYOUT | - ALIGN | - REORDER ); + + // Layout the text for the new width. + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | LAYOUT ); + + // Set the update info to relayout the whole text. + mImpl->mTextUpdateInfo.mParagraphCharacterIndex = 0u; + mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters = mImpl->mLogicalModel->mText.Count(); + + // Store the actual control's width. + const float actualControlWidth = mImpl->mVisualModel->mControlSize.width; DoRelayout( Size( width, MAX_FLOAT ), static_cast( onlyOnceOperations | - sizeOperations ), + LAYOUT ), layoutSize ); // Do not do again the only once operations. mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending & ~onlyOnceOperations ); // Do the size related operations again. + const OperationsMask sizeOperations = static_cast( LAYOUT | + ALIGN | + REORDER ); + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | sizeOperations ); + + // Clear the update info. This info will be set the next time the text is updated. + mImpl->mTextUpdateInfo.Clear(); + + // Restore the actual control's width. + mImpl->mVisualModel->mControlSize.width = actualControlWidth; + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetHeightForWidth calculated %f\n", layoutSize.height ); } else { - layoutSize = mImpl->mVisualModel->GetActualSize(); + layoutSize = mImpl->mVisualModel->GetLayoutSize(); DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetHeightForWidth cached %f\n", layoutSize.height ); } @@ -709,7 +1381,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 ) ) { @@ -719,50 +1391,72 @@ bool Controller::Relayout( const Size& size ) mImpl->mVisualModel->mGlyphPositions.Clear(); glyphsRemoved = true; } + + // Clear the update info. This info will be set the next time the text is updated. + mImpl->mTextUpdateInfo.Clear(); + // Not worth to relayout if width or height is equal to zero. DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::Relayout (skipped)\n" ); + return glyphsRemoved; } + // Whether a new size has been set. const bool newSize = ( size != mImpl->mVisualModel->mControlSize ); if( newSize ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "new size (previous size %f,%f)\n", mImpl->mVisualModel->mControlSize.width, mImpl->mVisualModel->mControlSize.height ); - // Operations that need to be done if the size changes. + // Layout operations that need to be done if the size changes. mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | LAYOUT | ALIGN | UPDATE_ACTUAL_SIZE | REORDER ); + // Set the update info to relayout the whole text. + mImpl->mTextUpdateInfo.mFullRelayoutNeeded = true; + mImpl->mTextUpdateInfo.mCharacterIndex = 0u; + } - mImpl->mVisualModel->mControlSize = size; + // Whether there are modify events. + if( 0u != mImpl->mModifyEvents.Count() ) + { + // Style operations that need to be done if the text is modified. + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | + COLOR ); } - // Make sure the model is up-to-date before layouting + // Make sure the model is up-to-date before layouting. ProcessModifyEvents(); - mImpl->UpdateModel( mImpl->mOperationsPending ); + bool updated = mImpl->UpdateModel( mImpl->mOperationsPending ); + // Layout the text. Size layoutSize; - bool updated = DoRelayout( mImpl->mVisualModel->mControlSize, - mImpl->mOperationsPending, - layoutSize ); + updated = DoRelayout( size, + mImpl->mOperationsPending, + layoutSize ) || updated; // Do not re-do any operation until something changes. mImpl->mOperationsPending = NO_OPERATION; - // Keep the current offset and alignment as it will be used to update the decorator's positions (if the size changes). + // Whether the text control is editable + const bool isEditable = NULL != mImpl->mEventData; + + // Keep the current offset as it will be used to update the decorator's positions (if the size changes). Vector2 offset; - if( newSize && mImpl->mEventData ) + if( newSize && isEditable ) { - offset = mImpl->mAlignmentOffset + mImpl->mEventData->mScrollPosition; + offset = mImpl->mScrollPosition; } - // After doing the text layout, the alignment offset to place the actor in the desired position can be calculated. - CalculateTextAlignment( size ); + if( !isEditable || !IsMultiLineEnabled() ) + { + // After doing the text layout, the vertical offset to place the actor in the desired position can be calculated. + CalculateVerticalOffset( size ); + } - if( mImpl->mEventData ) + if( isEditable ) { if( newSize ) { @@ -770,35 +1464,49 @@ bool Controller::Relayout( const Size& size ) mImpl->ClampHorizontalScroll( layoutSize ); // Update the decorator's positions is needed if there is a new size. - mImpl->mEventData->mDecorator->UpdatePositions( mImpl->mAlignmentOffset + mImpl->mEventData->mScrollPosition - offset ); + mImpl->mEventData->mDecorator->UpdatePositions( mImpl->mScrollPosition - offset ); } // Move the cursor, grab handle etc. updated = mImpl->ProcessInputEvents() || 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; } void Controller::ProcessModifyEvents() { - std::vector& events = mImpl->mModifyEvents; + Vector& events = mImpl->mModifyEvents; - for( unsigned int i=0; i::ConstIterator it = events.Begin(), + endIt = events.End(); + it != endIt; + ++it ) + { + const ModifyEvent& event = *it; + + if( ModifyEvent::TEXT_REPLACED == event.type ) { // A (single) replace event should come first, otherwise we wasted time processing NOOP events - DALI_ASSERT_DEBUG( 0 == i && "Unexpected TEXT_REPLACED event" ); + DALI_ASSERT_DEBUG( it == events.Begin() && "Unexpected TEXT_REPLACED event" ); TextReplacedEvent(); } - else if( ModifyEvent::TEXT_INSERTED == events[i].type ) + else if( ModifyEvent::TEXT_INSERTED == event.type ) { TextInsertedEvent(); } - else if( ModifyEvent::TEXT_DELETED == events[i].type ) + else if( ModifyEvent::TEXT_DELETED == event.type ) { // Placeholder-text cannot be deleted if( !mImpl->IsShowingPlaceholderText() ) @@ -808,26 +1516,31 @@ void Controller::ProcessModifyEvents() } } - if( mImpl->mEventData && - 0 != events.size() ) + if( NULL != mImpl->mEventData ) { // When the text is being modified, delay cursor blinking mImpl->mEventData->mDecorator->DelayCursorBlink(); } // Discard temporary text - events.clear(); + events.Clear(); } void Controller::ResetText() { // Reset buffers. mImpl->mLogicalModel->mText.Clear(); - ClearModelData(); // We have cleared everything including the placeholder-text mImpl->PlaceholderCleared(); + mImpl->mTextUpdateInfo.mCharacterIndex = 0u; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = 0u; + + // Clear any previous text. + mImpl->mTextUpdateInfo.mClearAll = true; + // The natural size needs to be re-calculated. mImpl->mRecalculateNaturalSize = true; @@ -843,9 +1556,7 @@ void Controller::ResetCursorPosition( CharacterIndex cursorIndex ) mImpl->mEventData->mPrimaryCursorPosition = cursorIndex; // Update the cursor if it's in editing mode. - if( ( EventData::EDITING == mImpl->mEventData->mState ) || - ( EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState ) || - ( EventData::EDITING_WITH_GRAB_HANDLE == mImpl->mEventData->mState ) ) + if( EventData::IsEditingState( mImpl->mEventData->mState ) ) { mImpl->mEventData->mUpdateCursorPosition = true; } @@ -857,80 +1568,50 @@ void Controller::ResetScrollPosition() if( NULL != mImpl->mEventData ) { // Reset the scroll position. - mImpl->mEventData->mScrollPosition = Vector2::ZERO; + mImpl->mScrollPosition = Vector2::ZERO; mImpl->mEventData->mScrollAfterUpdatePosition = true; } } void Controller::TextReplacedEvent() { - // Reset buffers. - ClearModelData(); - // The natural size needs to be re-calculated. mImpl->mRecalculateNaturalSize = true; // Apply modifications to the model mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->UpdateModel( ALL_OPERATIONS ); - mImpl->mOperationsPending = static_cast( LAYOUT | - ALIGN | - UPDATE_ACTUAL_SIZE | - REORDER ); } void Controller::TextInsertedEvent() { DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextInsertedEvent" ); - // TODO - Optimize this - ClearModelData(); + if( NULL == mImpl->mEventData ) + { + return; + } // The natural size needs to be re-calculated. mImpl->mRecalculateNaturalSize = true; // Apply modifications to the model; TODO - Optimize this mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->UpdateModel( ALL_OPERATIONS ); - mImpl->mOperationsPending = static_cast( LAYOUT | - ALIGN | - UPDATE_ACTUAL_SIZE | - REORDER ); - - // Queue a cursor reposition event; this must wait until after DoRelayout() - if( ( EventData::EDITING == mImpl->mEventData->mState ) || - ( EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState ) || - ( EventData::EDITING_WITH_GRAB_HANDLE == mImpl->mEventData->mState ) ) - { - mImpl->mEventData->mUpdateCursorPosition = true; - mImpl->mEventData->mScrollAfterUpdatePosition = true; - } } void Controller::TextDeletedEvent() { DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextDeletedEvent" ); - // TODO - Optimize this - ClearModelData(); + if( NULL == mImpl->mEventData ) + { + return; + } // The natural size needs to be re-calculated. mImpl->mRecalculateNaturalSize = true; // Apply modifications to the model; TODO - Optimize this mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->UpdateModel( ALL_OPERATIONS ); - mImpl->mOperationsPending = static_cast( LAYOUT | - ALIGN | - UPDATE_ACTUAL_SIZE | - REORDER ); - - // Queue a cursor reposition event; this must wait until after DoRelayout() - mImpl->mEventData->mUpdateCursorPosition = true; - if( 0u != mImpl->mLogicalModel->mText.Count() ) - { - mImpl->mEventData->mScrollAfterDelete = true; - } } bool Controller::DoRelayout( const Size& size, @@ -943,16 +1624,35 @@ bool Controller::DoRelayout( const Size& size, // Calculate the operations to be done. const OperationsMask operations = static_cast( mImpl->mOperationsPending & operationsRequired ); - if( LAYOUT & operations ) + const CharacterIndex startIndex = mImpl->mTextUpdateInfo.mParagraphCharacterIndex; + const Length requestedNumberOfCharacters = mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters; + + 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. - const Length numberOfGlyphs = mImpl->mVisualModel->mGlyphs.Count(); + // Calculate the number of glyphs to layout. + const Vector& charactersToGlyph = mImpl->mVisualModel->mCharactersToGlyph; + const Vector& glyphsPerCharacter = mImpl->mVisualModel->mGlyphsPerCharacter; + const GlyphIndex* const charactersToGlyphBuffer = charactersToGlyph.Begin(); + const Length* const glyphsPerCharacterBuffer = glyphsPerCharacter.Begin(); - if( 0u == numberOfGlyphs ) + const CharacterIndex lastIndex = startIndex + ( ( requestedNumberOfCharacters > 0u ) ? requestedNumberOfCharacters - 1u : 0u ); + const GlyphIndex startGlyphIndex = mImpl->mTextUpdateInfo.mStartGlyphIndex; + const Length numberOfGlyphs = ( requestedNumberOfCharacters > 0u ) ? *( charactersToGlyphBuffer + lastIndex ) + *( glyphsPerCharacterBuffer + lastIndex ) - startGlyphIndex : 0u; + const Length totalNumberOfGlyphs = mImpl->mVisualModel->mGlyphs.Count(); + + if( 0u == totalNumberOfGlyphs ) { + if( NO_OPERATION != ( UPDATE_ACTUAL_SIZE & operations ) ) + { + mImpl->mVisualModel->SetLayoutSize( Size::ZERO ); + } + // Nothing else to do if there is no glyphs. DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::DoRelayout no glyphs, view updated true\n" ); return true; @@ -972,42 +1672,46 @@ bool Controller::DoRelayout( const Size& size, lineBreakInfo.Begin(), wordBreakInfo.Begin(), ( 0u != characterDirection.Count() ) ? characterDirection.Begin() : NULL, - numberOfGlyphs, glyphs.Begin(), glyphsToCharactersMap.Begin(), - charactersPerGlyph.Begin() ); - - // The laid-out lines. - // It's not possible to know in how many lines the text is going to be laid-out, - // but it can be resized at least with the number of 'paragraphs' to avoid - // some re-allocations. - Vector& lines = mImpl->mVisualModel->mLines; - - // Delete any previous laid out lines before setting the new ones. - lines.Clear(); - - // The capacity of the bidirectional paragraph info is the number of paragraphs. - lines.Reserve( mImpl->mLogicalModel->mBidirectionalParagraphInfo.Capacity() ); + charactersPerGlyph.Begin(), + charactersToGlyphBuffer, + glyphsPerCharacterBuffer, + totalNumberOfGlyphs ); // Resize the vector of positions to have the same size than the vector of glyphs. Vector& glyphPositions = mImpl->mVisualModel->mGlyphPositions; - glyphPositions.Resize( numberOfGlyphs ); + glyphPositions.Resize( totalNumberOfGlyphs ); // Whether the last character is a new paragraph character. - layoutParameters.isLastNewParagraph = TextAbstraction::IsNewParagraph( *( textBuffer + ( mImpl->mLogicalModel->mText.Count() - 1u ) ) ); + mImpl->mTextUpdateInfo.mIsLastCharacterNewParagraph = TextAbstraction::IsNewParagraph( *( textBuffer + ( mImpl->mLogicalModel->mText.Count() - 1u ) ) ); + layoutParameters.isLastNewParagraph = mImpl->mTextUpdateInfo.mIsLastCharacterNewParagraph; + + // The initial glyph and the number of glyphs to layout. + layoutParameters.startGlyphIndex = startGlyphIndex; + layoutParameters.numberOfGlyphs = numberOfGlyphs; + layoutParameters.startLineIndex = mImpl->mTextUpdateInfo.mStartLineIndex; + layoutParameters.estimatedNumberOfLines = mImpl->mTextUpdateInfo.mEstimatedNumberOfLines; // Update the visual model. viewUpdated = mImpl->mLayoutEngine.LayoutText( layoutParameters, glyphPositions, - lines, + 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; // Check first if there are paragraphs with bidirectional info. if( 0u != bidirectionalInfo.Count() ) @@ -1016,67 +1720,66 @@ bool Controller::DoRelayout( const Size& size, const Length numberOfLines = mImpl->mVisualModel->mLines.Count(); // Reorder the lines. - Vector lineBidirectionalInfoRuns; - lineBidirectionalInfoRuns.Reserve( numberOfLines ); // Reserve because is not known yet how many lines have right to left characters. + bidirectionalLineInfo.Reserve( numberOfLines ); // Reserve because is not known yet how many lines have right to left characters. ReorderLines( bidirectionalInfo, - lines, - lineBidirectionalInfoRuns ); - - // Set the bidirectional info into the model. - const Length numberOfBidirectionalInfoRuns = lineBidirectionalInfoRuns.Count(); - mImpl->mLogicalModel->SetVisualToLogicalMap( lineBidirectionalInfoRuns.Begin(), - numberOfBidirectionalInfoRuns ); + startIndex, + requestedNumberOfCharacters, + mImpl->mVisualModel->mLines, + bidirectionalLineInfo ); // Set the bidirectional info per line into the layout parameters. - layoutParameters.lineBidirectionalInfoRunsBuffer = lineBidirectionalInfoRuns.Begin(); - layoutParameters.numberOfBidirectionalInfoRuns = numberOfBidirectionalInfoRuns; - - // Get the character to glyph conversion table and set into the layout. - layoutParameters.charactersToGlyphsBuffer = mImpl->mVisualModel->mCharactersToGlyph.Begin(); - - // Get the glyphs per character table and set into the layout. - layoutParameters.glyphsPerCharacterBuffer = mImpl->mVisualModel->mGlyphsPerCharacter.Begin(); + layoutParameters.lineBidirectionalInfoRunsBuffer = bidirectionalLineInfo.Begin(); + layoutParameters.numberOfBidirectionalInfoRuns = bidirectionalLineInfo.Count(); // Re-layout the text. Reorder those lines with right to left characters. mImpl->mLayoutEngine.ReLayoutRightToLeftLines( layoutParameters, + startIndex, + requestedNumberOfCharacters, glyphPositions ); - // Free the allocated memory used to store the conversion table in the bidirectional line info run. - for( Vector::Iterator it = lineBidirectionalInfoRuns.Begin(), - endIt = lineBidirectionalInfoRuns.End(); - it != endIt; - ++it ) + if ( ( NO_OPERATION != ( UPDATE_DIRECTION & operations ) ) && ( numberOfLines > 0 ) ) { - BidirectionalLineInfoRun& bidiLineInfo = *it; - - free( bidiLineInfo.visualToLogicalMap ); + 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->SetActualSize( layoutSize ); + mImpl->mVisualModel->SetLayoutSize( layoutSize ); } } // view updated + + // Store the size used to layout the text. + mImpl->mVisualModel->mControlSize = size; } else { - layoutSize = mImpl->mVisualModel->GetActualSize(); + layoutSize = mImpl->mVisualModel->GetLayoutSize(); } - if( ALIGN & operations ) + if( NO_OPERATION != ( ALIGN & operations ) ) { // The laid-out lines. Vector& lines = mImpl->mVisualModel->mLines; - mImpl->mLayoutEngine.Align( layoutSize, + mImpl->mLayoutEngine.Align( size, + startIndex, + requestedNumberOfCharacters, lines ); 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; } @@ -1144,68 +1847,31 @@ LayoutEngine::VerticalAlignment Controller::GetVerticalAlignment() const return mImpl->mLayoutEngine.GetVerticalAlignment(); } -void Controller::CalculateTextAlignment( const Size& size ) +void Controller::CalculateVerticalOffset( const Size& controlSize ) { - // Get the direction of the first character. - const CharacterDirection firstParagraphDirection = mImpl->mLogicalModel->GetCharacterDirection( 0u ); + Size layoutSize = mImpl->mVisualModel->GetLayoutSize(); - Size actualSize = mImpl->mVisualModel->GetActualSize(); - if( fabsf( actualSize.height ) < Math::MACHINE_EPSILON_1000 ) + if( fabsf( layoutSize.height ) < Math::MACHINE_EPSILON_1000 ) { // Get the line height of the default font. - actualSize.height = mImpl->GetDefaultFontLineHeight(); - } - - // If the first paragraph is right to left swap ALIGN_BEGIN and ALIGN_END; - LayoutEngine::HorizontalAlignment horizontalAlignment = mImpl->mLayoutEngine.GetHorizontalAlignment(); - if( firstParagraphDirection && - ( LayoutEngine::HORIZONTAL_ALIGN_CENTER != horizontalAlignment ) ) - { - if( LayoutEngine::HORIZONTAL_ALIGN_BEGIN == horizontalAlignment ) - { - horizontalAlignment = LayoutEngine::HORIZONTAL_ALIGN_END; - } - else - { - horizontalAlignment = LayoutEngine::HORIZONTAL_ALIGN_BEGIN; - } - } - - switch( horizontalAlignment ) - { - case LayoutEngine::HORIZONTAL_ALIGN_BEGIN: - { - mImpl->mAlignmentOffset.x = 0.f; - break; - } - case LayoutEngine::HORIZONTAL_ALIGN_CENTER: - { - mImpl->mAlignmentOffset.x = floorf( 0.5f * ( size.width - actualSize.width ) ); // try to avoid pixel alignment. - break; - } - case LayoutEngine::HORIZONTAL_ALIGN_END: - { - mImpl->mAlignmentOffset.x = size.width - actualSize.width; - break; - } + layoutSize.height = mImpl->GetDefaultFontLineHeight(); } - const LayoutEngine::VerticalAlignment verticalAlignment = mImpl->mLayoutEngine.GetVerticalAlignment(); - switch( verticalAlignment ) + switch( mImpl->mLayoutEngine.GetVerticalAlignment() ) { case LayoutEngine::VERTICAL_ALIGN_TOP: { - mImpl->mAlignmentOffset.y = 0.f; + mImpl->mScrollPosition.y = 0.f; break; } case LayoutEngine::VERTICAL_ALIGN_CENTER: { - mImpl->mAlignmentOffset.y = floorf( 0.5f * ( size.height - actualSize.height ) ); // try to avoid pixel alignment. + mImpl->mScrollPosition.y = floorf( 0.5f * ( controlSize.height - layoutSize.height ) ); // try to avoid pixel alignment. break; } case LayoutEngine::VERTICAL_ALIGN_BOTTOM: { - mImpl->mAlignmentOffset.y = size.height - actualSize.height; + mImpl->mScrollPosition.y = controlSize.height - layoutSize.height; break; } } @@ -1225,7 +1891,7 @@ void Controller::KeyboardFocusGainEvent() { DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusGainEvent" ); - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { if( ( EventData::INACTIVE == mImpl->mEventData->mState ) || ( EventData::INTERRUPTED == mImpl->mEventData->mState ) ) @@ -1248,9 +1914,9 @@ void Controller::KeyboardFocusLostEvent() { DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusLostEvent" ); - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { - if ( EventData::INTERRUPTED != mImpl->mEventData->mState ) + if( EventData::INTERRUPTED != mImpl->mEventData->mState ) { mImpl->ChangeState( EventData::INACTIVE ); @@ -1270,8 +1936,8 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) bool textChanged( false ); - if( mImpl->mEventData && - keyEvent.state == KeyEvent::Down ) + if( ( NULL != mImpl->mEventData ) && + ( keyEvent.state == KeyEvent::Down ) ) { int keyCode = keyEvent.keyCode; const std::string& keyString = keyEvent.keyPressed; @@ -1282,10 +1948,10 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) // Escape key is a special case which causes focus loss KeyboardFocusLostEvent(); } - else if( Dali::DALI_KEY_CURSOR_LEFT == keyCode || - Dali::DALI_KEY_CURSOR_RIGHT == keyCode || - Dali::DALI_KEY_CURSOR_UP == keyCode || - Dali::DALI_KEY_CURSOR_DOWN == keyCode ) + else if( ( Dali::DALI_KEY_CURSOR_LEFT == keyCode ) || + ( Dali::DALI_KEY_CURSOR_RIGHT == keyCode ) || + ( Dali::DALI_KEY_CURSOR_UP == keyCode ) || + ( Dali::DALI_KEY_CURSOR_DOWN == keyCode ) ) { Event event( Event::CURSOR_KEY_EVENT ); event.p1.mInt = keyCode; @@ -1295,13 +1961,13 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) { textChanged = BackspaceKeyEvent(); } - else if ( IsKey( keyEvent, Dali::DALI_KEY_POWER ) ) + else if( IsKey( keyEvent, Dali::DALI_KEY_POWER ) ) { mImpl->ChangeState( EventData::INTERRUPTED ); // State is not INACTIVE as expect to return to edit mode. // Avoids calling the InsertText() method which can delete selected text } - else if ( IsKey( keyEvent, Dali::DALI_KEY_MENU ) || - IsKey( keyEvent, Dali::DALI_KEY_HOME ) ) + else if( IsKey( keyEvent, Dali::DALI_KEY_MENU ) || + IsKey( keyEvent, Dali::DALI_KEY_HOME ) ) { mImpl->ChangeState( EventData::INACTIVE ); // Menu/Home key behaviour does not allow edit mode to resume like Power key @@ -1326,8 +1992,12 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) } if ( ( mImpl->mEventData->mState != EventData::INTERRUPTED ) && - ( mImpl->mEventData->mState != EventData::INACTIVE ) ) + ( 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 ); } @@ -1340,7 +2010,7 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) mImpl->mControlInterface.TextChanged(); } - return false; + return true; } void Controller::InsertText( const std::string& text, Controller::InsertType type ) @@ -1349,6 +2019,12 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ bool maxLengthReached( false ); DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected InsertText" ) + + if( NULL == mImpl->mEventData ) + { + return; + } + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::InsertText %p %s (%s) mPrimaryCursorPosition %d mPreEditFlag %d mPreEditStartPosition %d mPreEditLength %d\n", this, text.c_str(), (COMMIT == type ? "COMMIT" : "PRE_EDIT"), mImpl->mEventData->mPrimaryCursorPosition, mImpl->mEventData->mPreEditFlag, mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength ); @@ -1356,27 +2032,28 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ // TODO: At the moment the underline runs are only for pre-edit. mImpl->mVisualModel->mUnderlineRuns.Clear(); - Vector utf32Characters; - Length characterCount( 0u ); + // Keep the current number of characters. + const Length currentNumberOfCharacters = mImpl->IsShowingRealText() ? mImpl->mLogicalModel->mText.Count() : 0u; - // Remove the previous IMF pre-edit (predicitive text) - if( mImpl->mEventData && - mImpl->mEventData->mPreEditFlag && - 0 != mImpl->mEventData->mPreEditLength ) + // Remove the previous IMF pre-edit. + if( mImpl->mEventData->mPreEditFlag && ( 0u != mImpl->mEventData->mPreEditLength ) ) { - CharacterIndex offset = mImpl->mEventData->mPrimaryCursorPosition - mImpl->mEventData->mPreEditStartPosition; - - removedPrevious = RemoveText( -static_cast(offset), mImpl->mEventData->mPreEditLength ); + removedPrevious = RemoveText( -static_cast( mImpl->mEventData->mPrimaryCursorPosition - mImpl->mEventData->mPreEditStartPosition ), + mImpl->mEventData->mPreEditLength, + DONT_UPDATE_INPUT_STYLE ); mImpl->mEventData->mPrimaryCursorPosition = mImpl->mEventData->mPreEditStartPosition; - mImpl->mEventData->mPreEditLength = 0; + mImpl->mEventData->mPreEditLength = 0u; } else { - // Remove the previous Selection + // Remove the previous Selection. removedPrevious = RemoveSelectedText(); } + Vector utf32Characters; + Length characterCount = 0u; + if( !text.empty() ) { // Convert text into UTF-32 @@ -1405,39 +2082,121 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ mImpl->ChangeState( EventData::EDITING ); // Handle the IMF (predicitive text) state changes - if( mImpl->mEventData ) + if( COMMIT == type ) { - if( COMMIT == type ) - { - // IMF manager is no longer handling key-events - mImpl->ClearPreEditFlag(); - } - else // PRE_EDIT + // IMF manager is no longer handling key-events + mImpl->ClearPreEditFlag(); + } + else // PRE_EDIT + { + if( !mImpl->mEventData->mPreEditFlag ) { - if( !mImpl->mEventData->mPreEditFlag ) - { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Entered PreEdit state" ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Entered PreEdit state" ); - // Record the start of the pre-edit text - mImpl->mEventData->mPreEditStartPosition = mImpl->mEventData->mPrimaryCursorPosition; - } + // Record the start of the pre-edit text + mImpl->mEventData->mPreEditStartPosition = mImpl->mEventData->mPrimaryCursorPosition; + } - mImpl->mEventData->mPreEditLength = utf32Characters.Count(); - mImpl->mEventData->mPreEditFlag = true; + mImpl->mEventData->mPreEditLength = utf32Characters.Count(); + mImpl->mEventData->mPreEditFlag = true; - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "mPreEditStartPosition %d mPreEditLength %d\n", mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength ); - } + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "mPreEditStartPosition %d mPreEditLength %d\n", mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength ); } const Length numberOfCharactersInModel = mImpl->mLogicalModel->mText.Count(); - // Restrict new text to fit within Maximum characters setting - Length maxSizeOfNewText = std::min ( ( mImpl->mMaximumNumberOfCharacters - numberOfCharactersInModel ), characterCount ); + // Restrict new text to fit within Maximum characters setting. + Length maxSizeOfNewText = std::min( ( mImpl->mMaximumNumberOfCharacters - numberOfCharactersInModel ), characterCount ); maxLengthReached = ( characterCount > maxSizeOfNewText ); - // Insert at current cursor position + // The cursor position. CharacterIndex& cursorIndex = mImpl->mEventData->mPrimaryCursorPosition; + // Update the text's style. + + // Updates the text style runs by adding characters. + mImpl->mLogicalModel->UpdateTextStyleRuns( cursorIndex, maxSizeOfNewText ); + + // Get the character index from the cursor index. + const CharacterIndex styleIndex = ( cursorIndex > 0u ) ? cursorIndex - 1u : 0u; + + // 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 ); + + // Whether to add a new font run. + const bool addFontNameRun = style.familyName != mImpl->mEventData->mInputStyle.familyName; + const bool addFontWeightRun = style.weight != mImpl->mEventData->mInputStyle.weight; + const bool addFontWidthRun = style.width != mImpl->mEventData->mInputStyle.width; + const bool addFontSlantRun = style.slant != mImpl->mEventData->mInputStyle.slant; + const bool addFontSizeRun = style.size != mImpl->mEventData->mInputStyle.size; + + // Add style runs. + if( addColorRun ) + { + const VectorBase::SizeType numberOfRuns = mImpl->mLogicalModel->mColorRuns.Count(); + mImpl->mLogicalModel->mColorRuns.Resize( numberOfRuns + 1u ); + + ColorRun& colorRun = *( mImpl->mLogicalModel->mColorRuns.Begin() + numberOfRuns ); + colorRun.color = mImpl->mEventData->mInputStyle.textColor; + colorRun.characterRun.characterIndex = cursorIndex; + colorRun.characterRun.numberOfCharacters = maxSizeOfNewText; + } + + if( addFontNameRun || + addFontWeightRun || + addFontWidthRun || + addFontSlantRun || + addFontSizeRun ) + { + const VectorBase::SizeType numberOfRuns = mImpl->mLogicalModel->mFontDescriptionRuns.Count(); + mImpl->mLogicalModel->mFontDescriptionRuns.Resize( numberOfRuns + 1u ); + + FontDescriptionRun& fontDescriptionRun = *( mImpl->mLogicalModel->mFontDescriptionRuns.Begin() + numberOfRuns ); + + if( addFontNameRun ) + { + fontDescriptionRun.familyLength = mImpl->mEventData->mInputStyle.familyName.size(); + fontDescriptionRun.familyName = new char[fontDescriptionRun.familyLength]; + memcpy( fontDescriptionRun.familyName, mImpl->mEventData->mInputStyle.familyName.c_str(), fontDescriptionRun.familyLength ); + fontDescriptionRun.familyDefined = true; + + // The memory allocated for the font family name is freed when the font description is removed from the logical model. + } + + if( addFontWeightRun ) + { + fontDescriptionRun.weight = mImpl->mEventData->mInputStyle.weight; + fontDescriptionRun.weightDefined = true; + } + + if( addFontWidthRun ) + { + fontDescriptionRun.width = mImpl->mEventData->mInputStyle.width; + fontDescriptionRun.widthDefined = true; + } + + if( addFontSlantRun ) + { + fontDescriptionRun.slant = mImpl->mEventData->mInputStyle.slant; + fontDescriptionRun.slantDefined = true; + } + + if( addFontSizeRun ) + { + fontDescriptionRun.size = static_cast( mImpl->mEventData->mInputStyle.size * 64.f ); + fontDescriptionRun.sizeDefined = true; + } + + fontDescriptionRun.characterRun.characterIndex = cursorIndex; + fontDescriptionRun.characterRun.numberOfCharacters = maxSizeOfNewText; + } + + // Insert at current cursor position. Vector& modifyText = mImpl->mLogicalModel->mText; if( cursorIndex < numberOfCharactersInModel ) @@ -1449,12 +2208,19 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ modifyText.Insert( modifyText.End(), utf32Characters.Begin(), utf32Characters.Begin() + maxSizeOfNewText ); } + // Mark the first paragraph to be updated. + mImpl->mTextUpdateInfo.mCharacterIndex = std::min( cursorIndex, mImpl->mTextUpdateInfo.mCharacterIndex ); + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd += maxSizeOfNewText; + + // Update the cursor index. cursorIndex += maxSizeOfNewText; DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Inserted %d characters, new size %d new cursor %d\n", maxSizeOfNewText, mImpl->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition ); } - if( 0u == mImpl->mLogicalModel->mText.Count() && + const Length numberOfCharacters = mImpl->IsShowingRealText() ? mImpl->mLogicalModel->mText.Count() : 0u; + + if( ( 0u == mImpl->mLogicalModel->mText.Count() ) && mImpl->IsPlaceholderAvailable() ) { // Show place-holder if empty after removing the pre-edit text @@ -1463,10 +2229,20 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ mImpl->ClearPreEditFlag(); } else if( removedPrevious || - 0 != utf32Characters.Count() ) + ( 0 != utf32Characters.Count() ) ) { // Queue an inserted event mImpl->QueueModifyEvent( ModifyEvent::TEXT_INSERTED ); + + mImpl->mEventData->mUpdateCursorPosition = true; + if( numberOfCharacters < currentNumberOfCharacters ) + { + mImpl->mEventData->mScrollAfterDelete = true; + } + else + { + mImpl->mEventData->mScrollAfterUpdatePosition = true; + } } if( maxLengthReached ) @@ -1505,33 +2281,49 @@ void Controller::TapEvent( unsigned int tapCount, float x, float y ) if( NULL != mImpl->mEventData ) { + DALI_LOG_INFO( gLogFilter, Debug::Concise, "TapEvent state:%d \n", mImpl->mEventData->mState ); + if( 1u == tapCount ) { // This is to avoid unnecessary relayouts when tapping an empty text-field bool relayoutNeeded( false ); - if( mImpl->IsShowingRealText() && - EventData::EDITING == mImpl->mEventData->mState ) + if( ( EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState ) || + ( EventData::EDITING_WITH_PASTE_POPUP == mImpl->mEventData->mState ) ) { - // Show grab handle on second tap - mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE ); - relayoutNeeded = true; + mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE ); // If Popup shown hide it here so can be shown again if required. } - else if( EventData::EDITING != mImpl->mEventData->mState && - EventData::EDITING_WITH_GRAB_HANDLE != mImpl->mEventData->mState ) + + if( mImpl->IsShowingRealText() && ( EventData::INACTIVE != mImpl->mEventData->mState ) ) { - if( mImpl->IsShowingPlaceholderText() && ! mImpl->IsFocusedPlaceholderAvailable() ) + // Already in an active state so show a popup + if( !mImpl->IsClipboardEmpty() ) { - // Hide placeholder text - ResetText(); + // Shows Paste popup but could show full popup with Selection options. ( EDITING_WITH_POPUP ) + mImpl->ChangeState( EventData::EDITING_WITH_PASTE_POPUP ); + } + else + { + mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE ); } - // Show cursor on first tap - mImpl->ChangeState( EventData::EDITING ); relayoutNeeded = true; } - else if( mImpl->IsShowingRealText() ) + else { - // Move the cursor + if( mImpl->IsShowingPlaceholderText() && !mImpl->IsFocusedPlaceholderAvailable() ) + { + // Hide placeholder text + ResetText(); + } + + if( EventData::INACTIVE == mImpl->mEventData->mState ) + { + mImpl->ChangeState( EventData::EDITING ); + } + else if( !mImpl->IsClipboardEmpty() ) + { + mImpl->ChangeState( EventData::EDITING_WITH_POPUP ); + } relayoutNeeded = true; } @@ -1562,10 +2354,11 @@ void Controller::TapEvent( unsigned int tapCount, float x, float y ) } void Controller::PanEvent( Gesture::State state, const Vector2& displacement ) + // Show cursor and grabhandle on first tap, this matches the behaviour of tapping when already editing { DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected PanEvent" ); - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { Event event( Event::PAN_EVENT ); event.p1.mInt = state; @@ -1581,10 +2374,10 @@ void Controller::LongPressEvent( Gesture::State state, float x, float y ) { DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected LongPressEvent" ); - if( state == Gesture::Started && - mImpl->mEventData ) + if( ( state == Gesture::Started ) && + ( NULL != mImpl->mEventData ) ) { - if( ! mImpl->IsShowingRealText() ) + if( !mImpl->IsShowingRealText() ) { Event event( Event::LONG_PRESS_EVENT ); event.p1.mInt = state; @@ -1619,7 +2412,9 @@ void Controller::LongPressEvent( Gesture::State state, float x, float y ) void Controller::SelectEvent( float x, float y, bool selectAll ) { - if( mImpl->mEventData ) + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SelectEvent\n" ); + + if( NULL != mImpl->mEventData ) { mImpl->ChangeState( EventData::SELECTING ); @@ -1654,7 +2449,7 @@ void Controller::DecorationEvent( HandleType handleType, HandleState state, floa { DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected DecorationEvent" ); - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { switch( handleType ) { @@ -1723,8 +2518,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 ) @@ -1741,13 +2541,7 @@ 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() || + if( ( 0u != mImpl->mLogicalModel->mText.Count() ) || !mImpl->IsPlaceholderAvailable() ) { mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); @@ -1755,8 +2549,11 @@ void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Butt else { ShowPlaceholderText(); - mImpl->mEventData->mUpdateCursorPosition = true; } + + mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->mEventData->mScrollAfterDelete = true; + mImpl->RequestRelayout(); mImpl->mControlInterface.TextChanged(); break; @@ -1778,7 +2575,7 @@ void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Butt { const Vector2& currentCursorPosition = mImpl->mEventData->mDecorator->GetPosition( PRIMARY_CURSOR ); - if( mImpl->mEventData->mSelectionEnabled ) + if( mImpl->mEventData->mSelectionEnabled ) { // Creates a SELECT event. SelectEvent( currentCursorPosition.x, currentCursorPosition.y, false ); @@ -1806,35 +2603,38 @@ 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( 0 ); + // Whether to retrieve the text and cursor position to be sent to the IMF manager. + bool retrieveText = false; + bool retrieveCursor = false; - switch ( imfEvent.eventName ) + 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 ); + const bool textDeleted = RemoveText( imfEvent.cursorOffset, + imfEvent.numberOfChars, + DONT_UPDATE_INPUT_STYLE ); - if( update ) + if( textDeleted ) { - if( 0u != mImpl->mLogicalModel->mText.Count() || + if( ( 0u != mImpl->mLogicalModel->mText.Count() ) || !mImpl->IsPlaceholderAvailable() ) { mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); @@ -1842,19 +2642,18 @@ ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, cons else { ShowPlaceholderText(); - mImpl->mEventData->mUpdateCursorPosition = true; } + 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: @@ -1864,12 +2663,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; @@ -1879,7 +2672,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; } @@ -1893,11 +2711,16 @@ bool Controller::BackspaceKeyEvent() { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::KeyEvent %p DALI_KEY_BACKSPACE\n", this ); + bool removed = false; + + if( NULL == mImpl->mEventData ) + { + return removed; + } + // IMF manager is no longer handling key-events mImpl->ClearPreEditFlag(); - bool removed( false ); - if( EventData::SELECTING == mImpl->mEventData->mState ) { removed = RemoveSelectedText(); @@ -1905,17 +2728,14 @@ 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 ) { - 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() || + if( ( 0u != mImpl->mLogicalModel->mText.Count() ) || !mImpl->IsPlaceholderAvailable() ) { mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); @@ -1923,38 +2743,25 @@ bool Controller::BackspaceKeyEvent() else { ShowPlaceholderText(); - mImpl->mEventData->mUpdateCursorPosition = true; } + mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->mEventData->mScrollAfterDelete = true; } return removed; } -void Controller::NotifyImfManager() -{ - if( mImpl->mEventData ) - { - ImfManager imfManager = ImfManager::Get(); - - if( imfManager ) - { - // Notifying IMF of a cursor change triggers a surrounding text request so updating it now. - std::string text; - GetText( text ); - imfManager.SetSurroundingText( text ); - - imfManager.SetCursorPosition( GetLogicalCursorPosition() ); - imfManager.NotifyCursorPosition(); - } - } -} - void Controller::ShowPlaceholderText() { if( mImpl->IsPlaceholderAvailable() ) { DALI_ASSERT_DEBUG( mImpl->mEventData && "No placeholder text available" ); + if( NULL == mImpl->mEventData ) + { + return; + } + mImpl->mEventData->mIsShowingPlaceholderText = true; // Disable handles when showing place-holder text @@ -1966,8 +2773,8 @@ void Controller::ShowPlaceholderText() size_t size( 0 ); // TODO - Switch placeholder text styles when changing state - if( EventData::INACTIVE != mImpl->mEventData->mState && - 0u != mImpl->mEventData->mPlaceholderTextActive.c_str() ) + if( ( EventData::INACTIVE != mImpl->mEventData->mState ) && + ( 0u != mImpl->mEventData->mPlaceholderTextActive.c_str() ) ) { text = mImpl->mEventData->mPlaceholderTextActive.c_str(); size = mImpl->mEventData->mPlaceholderTextActive.size(); @@ -1978,9 +2785,11 @@ void Controller::ShowPlaceholderText() size = mImpl->mEventData->mPlaceholderTextInactive.size(); } + mImpl->mTextUpdateInfo.mCharacterIndex = 0u; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; + // Reset model for showing placeholder. mImpl->mLogicalModel->mText.Clear(); - ClearModelData(); mImpl->mVisualModel->SetTextColor( mImpl->mEventData->mPlaceholderTextColor ); // Convert text into UTF-32 @@ -1992,9 +2801,12 @@ void Controller::ShowPlaceholderText() // Transform a text array encoded in utf8 into an array encoded in utf32. // It returns the actual number of characters. - Length characterCount = Utf8ToUtf32( utf8, size, utf32Characters.Begin() ); + const Length characterCount = Utf8ToUtf32( utf8, size, utf32Characters.Begin() ); utf32Characters.Resize( characterCount ); + // The characters to be added. + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = characterCount; + // Reset the cursor position mImpl->mEventData->mPrimaryCursorPosition = 0; @@ -2009,40 +2821,36 @@ void Controller::ShowPlaceholderText() } } -void Controller::ClearModelData() +void Controller::ClearFontData() { - // n.b. This does not Clear the mText from mLogicalModel - mImpl->mLogicalModel->mScriptRuns.Clear(); - mImpl->mLogicalModel->mFontRuns.Clear(); - mImpl->mLogicalModel->mLineBreakInfo.Clear(); - mImpl->mLogicalModel->mWordBreakInfo.Clear(); - mImpl->mLogicalModel->mBidirectionalParagraphInfo.Clear(); - mImpl->mLogicalModel->mCharacterDirections.Clear(); - mImpl->mLogicalModel->mBidirectionalLineInfo.Clear(); - mImpl->mLogicalModel->mLogicalToVisualMap.Clear(); - mImpl->mLogicalModel->mVisualToLogicalMap.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(); + if( mImpl->mFontDefaults ) + { + mImpl->mFontDefaults->mFontId = 0u; // Remove old font ID + } + + // 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::ClearFontData() +void Controller::ClearStyleData() { - 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(); + mImpl->mLogicalModel->mColorRuns.Clear(); + mImpl->mLogicalModel->ClearFontDescriptionRuns(); } Controller::Controller( ControlInterface& controlInterface )