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=8175be4dd8fa0d0d0cbcff93299da1c20bc0320f;hp=ab4179099bc1238d1e24e80bb55b3463f865e7f3;hb=1ddae9e559e4bb52c660a863b6b3dc2dbab29536;hpb=269ef791ecea99b85d6241ad8e39769e1db312b3 diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index ab41790..8175be4 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -40,7 +40,6 @@ namespace #endif const float MAX_FLOAT = std::numeric_limits::max(); -const unsigned int POINTS_PER_INCH = 72; const std::string EMPTY_STRING(""); @@ -68,15 +67,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(); @@ -107,6 +110,17 @@ void Controller::EnableTextInput( DecoratorPtr 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; @@ -117,6 +131,68 @@ 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" ); @@ -146,6 +222,8 @@ void Controller::SetText( const std::string& text ) if( !text.empty() ) { + mImpl->mVisualModel->SetTextColor( mImpl->mTextColor ); + MarkupProcessData markupProcessData( mImpl->mLogicalModel->mColorRuns, mImpl->mLogicalModel->mFontDescriptionRuns ); @@ -179,6 +257,9 @@ void Controller::SetText( const std::string& text ) 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; @@ -210,9 +291,6 @@ void Controller::SetText( const std::string& text ) mImpl->mEventData->mEventQueue.clear(); } - // Notify IMF as text changed - NotifyImfManager(); - // Do this last since it provides callbacks into application code mImpl->mControlInterface.TextChanged(); } @@ -221,12 +299,8 @@ void Controller::GetText( std::string& text ) const { if( !mImpl->IsShowingPlaceholderText() ) { - Vector& utf32Characters = mImpl->mLogicalModel->mText; - - if( 0u != utf32Characters.Count() ) - { - Utf32ToUtf8( &utf32Characters[0], utf32Characters.Count(), text ); - } + // Retrieves the text string. + mImpl->GetText( 0u, text ); } else { @@ -234,16 +308,6 @@ void Controller::GetText( std::string& text ) const } } -unsigned int Controller::GetLogicalCursorPosition() const -{ - if( NULL != mImpl->mEventData ) - { - return mImpl->mEventData->mPrimaryCursorPosition; - } - - return 0u; -} - void Controller::SetPlaceholderText( PlaceholderType type, const std::string& text ) { if( NULL != mImpl->mEventData ) @@ -305,9 +369,6 @@ void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily ) // Clear the font-specific data ClearFontData(); - mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); } @@ -354,9 +415,6 @@ void Controller::SetDefaultFontWeight( FontWeight weight ) // Clear the font-specific data ClearFontData(); - mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); } @@ -383,9 +441,6 @@ void Controller::SetDefaultFontWidth( FontWidth width ) // Clear the font-specific data ClearFontData(); - mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); } @@ -412,9 +467,6 @@ void Controller::SetDefaultFontSlant( FontSlant slant ) // Clear the font-specific data ClearFontData(); - mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); } @@ -438,21 +490,9 @@ void Controller::SetDefaultPointSize( float pointSize ) mImpl->mFontDefaults->mDefaultPointSize = pointSize; mImpl->mFontDefaults->sizeDefined = true; - unsigned int horizontalDpi( 0u ); - unsigned int verticalDpi( 0u ); - mImpl->mFontClient.GetDpi( horizontalDpi, verticalDpi ); - - // Adjust the metrics if the fixed-size font should be down-scaled - int maxEmojiSize( pointSize/POINTS_PER_INCH * verticalDpi ); - DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetDefaultPointSize %p setting MaxEmojiSize %d\n", this, maxEmojiSize ); - mImpl->mMetrics->SetMaxEmojiSize( maxEmojiSize ); - // Clear the font-specific data ClearFontData(); - mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); } @@ -468,16 +508,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(); } } @@ -499,7 +538,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; @@ -530,17 +571,24 @@ bool Controller::RemoveText( int cursorOffset, int numberOfCharacters ) numberOfCharacters = currentText.Count() - cursorIndex; } - if( ( cursorIndex + numberOfCharacters ) <= 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. - // 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. @@ -552,6 +600,8 @@ bool Controller::RemoveText( int cursorOffset, int numberOfCharacters ) // Cursor position retreat oldCursorIndex = cursorIndex; + mImpl->mEventData->mScrollAfterDelete = true; + DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::RemoveText %p removed %d\n", this, numberOfCharacters ); removed = true; } @@ -608,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 ); @@ -644,11 +714,83 @@ 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 ) { @@ -670,6 +812,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; } } } @@ -695,8 +841,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]; @@ -706,10 +856,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; @@ -757,17 +918,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; @@ -795,17 +971,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; @@ -833,17 +1024,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; @@ -870,17 +1076,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; @@ -900,6 +1121,96 @@ float Controller::GetInputFontPointSize() const 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" ); @@ -928,17 +1239,7 @@ bool Controller::GetEnableCursorBlink() const const Vector2& Controller::GetScrollPosition() const { - if( NULL != mImpl->mEventData ) - { - return mImpl->mEventData->mScrollPosition; - } - - return Vector2::ZERO; -} - -const Vector2& Controller::GetAlignmentOffset() const -{ - return mImpl->mAlignmentOffset; + return mImpl->mScrollPosition; } Vector3 Controller::GetNaturalSize() @@ -963,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 @@ -985,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 @@ -1021,21 +1336,38 @@ 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 @@ -1049,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 ) ) { @@ -1059,8 +1391,13 @@ 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; } @@ -1077,30 +1414,26 @@ bool Controller::Relayout( const Size& size ) ALIGN | UPDATE_ACTUAL_SIZE | REORDER ); - - mImpl->mVisualModel->mControlSize = size; + // Set the update info to relayout the whole text. + mImpl->mTextUpdateInfo.mFullRelayoutNeeded = true; + mImpl->mTextUpdateInfo.mCharacterIndex = 0u; } // 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; - updated = DoRelayout( mImpl->mVisualModel->mControlSize, + updated = DoRelayout( size, mImpl->mOperationsPending, layoutSize ) || updated; @@ -1110,15 +1443,18 @@ bool Controller::Relayout( const Size& size ) // Whether the text control is editable const bool isEditable = NULL != mImpl->mEventData; - // Keep the current offset and alignment as it will be used to update the decorator's positions (if the size changes). + // Keep the current offset as it will be used to update the decorator's positions (if the size changes). Vector2 offset; 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( isEditable ) { @@ -1128,14 +1464,17 @@ 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; } @@ -1191,11 +1530,17 @@ 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; @@ -1223,26 +1568,18 @@ 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() @@ -1254,26 +1591,11 @@ void Controller::TextInsertedEvent() return; } - // TODO - Optimize this - ClearModelData(); - // 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::IsEditingState( mImpl->mEventData->mState ) ) - { - mImpl->mEventData->mUpdateCursorPosition = true; - mImpl->mEventData->mScrollAfterUpdatePosition = true; - } } void Controller::TextDeletedEvent() @@ -1285,26 +1607,11 @@ void Controller::TextDeletedEvent() return; } - // TODO - Optimize this - ClearModelData(); - // 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, @@ -1317,17 +1624,31 @@ 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(); + + 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 == numberOfGlyphs ) + if( 0u == totalNumberOfGlyphs ) { - if( UPDATE_ACTUAL_SIZE & operations ) + if( NO_OPERATION != ( UPDATE_ACTUAL_SIZE & operations ) ) { mImpl->mVisualModel->SetLayoutSize( Size::ZERO ); } @@ -1344,8 +1665,6 @@ bool Controller::DoRelayout( const Size& size, const Vector& glyphsToCharactersMap = mImpl->mVisualModel->mGlyphsToCharacters; const Vector& charactersPerGlyph = mImpl->mVisualModel->mCharactersPerGlyph; const Character* const textBuffer = mImpl->mLogicalModel->mText.Begin(); - const Vector& charactersToGlyph = mImpl->mVisualModel->mCharactersToGlyph; - const Vector& glyphsPerCharacter = mImpl->mVisualModel->mGlyphsPerCharacter; // Set the layout parameters. LayoutParameters layoutParameters( size, @@ -1356,43 +1675,40 @@ bool Controller::DoRelayout( const Size& size, glyphs.Begin(), glyphsToCharactersMap.Begin(), charactersPerGlyph.Begin(), - charactersToGlyph.Begin(), - glyphsPerCharacter.Begin(), - numberOfGlyphs ); - - // 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() ); + 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 = 0u; + 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; @@ -1402,69 +1718,56 @@ bool Controller::DoRelayout( const Size& size, { // Get the lines const Length numberOfLines = mImpl->mVisualModel->mLines.Count(); - const CharacterIndex startIndex = 0u; - const Length requestedNumberOfCharacters = mImpl->mLogicalModel->mText.Count(); // Reorder the lines. bidirectionalLineInfo.Reserve( numberOfLines ); // Reserve because is not known yet how many lines have right to left characters. ReorderLines( bidirectionalInfo, startIndex, requestedNumberOfCharacters, - lines, + mImpl->mVisualModel->mLines, bidirectionalLineInfo ); // Set the bidirectional info per line into the layout parameters. layoutParameters.lineBidirectionalInfoRunsBuffer = bidirectionalLineInfo.Begin(); layoutParameters.numberOfBidirectionalInfoRuns = bidirectionalLineInfo.Count(); - // Set the bidirectional info into the model. - mImpl->mLogicalModel->SetVisualToLogicalMap( layoutParameters.lineBidirectionalInfoRunsBuffer, - layoutParameters.numberOfBidirectionalInfoRuns, - startIndex, - requestedNumberOfCharacters ); - // 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 = bidirectionalLineInfo.Begin(), - endIt = bidirectionalLineInfo.End(); - it != endIt; - ++it ) + if ( ( NO_OPERATION != ( UPDATE_DIRECTION & operations ) ) && ( numberOfLines > 0 ) ) { - BidirectionalLineInfoRun& bidiLineInfo = *it; - - free( bidiLineInfo.visualToLogicalMap ); - bidiLineInfo.visualToLogicalMap = NULL; + const LineRun* const firstline = mImpl->mVisualModel->mLines.Begin(); + if ( firstline ) + { + mImpl->mAutoScrollDirectionRTL = firstline->direction; + } } - - bidirectionalLineInfo.Clear(); } } // REORDER // Sets the actual size. - if( UPDATE_ACTUAL_SIZE & operations ) + if( NO_OPERATION != ( UPDATE_ACTUAL_SIZE & operations ) ) { mImpl->mVisualModel->SetLayoutSize( layoutSize ); } } // view updated + + // Store the size used to layout the text. + mImpl->mVisualModel->mControlSize = size; } else { layoutSize = mImpl->mVisualModel->GetLayoutSize(); } - if( ALIGN & operations ) + if( NO_OPERATION != ( ALIGN & operations ) ) { // The laid-out lines. Vector& lines = mImpl->mVisualModel->mLines; - const CharacterIndex startIndex = 0u; - const Length requestedNumberOfCharacters = mImpl->mLogicalModel->mText.Count(); - mImpl->mLayoutEngine.Align( size, startIndex, requestedNumberOfCharacters, @@ -1472,7 +1775,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; } @@ -1540,7 +1847,7 @@ LayoutEngine::VerticalAlignment Controller::GetVerticalAlignment() const return mImpl->mLayoutEngine.GetVerticalAlignment(); } -void Controller::CalculateTextAlignment( const Size& controlSize ) +void Controller::CalculateVerticalOffset( const Size& controlSize ) { Size layoutSize = mImpl->mVisualModel->GetLayoutSize(); @@ -1550,71 +1857,21 @@ void Controller::CalculateTextAlignment( const Size& controlSize ) layoutSize.height = mImpl->GetDefaultFontLineHeight(); } - if( LayoutEngine::SINGLE_LINE_BOX == mImpl->mLayoutEngine.GetLayout() ) - { - // Get the direction of the first character. - const CharacterDirection firstParagraphDirection = mImpl->mLogicalModel->GetCharacterDirection( 0u ); - - // If the first paragraph is right to left swap ALIGN_BEGIN and ALIGN_END; - LayoutEngine::HorizontalAlignment horizontalAlignment = mImpl->mLayoutEngine.GetHorizontalAlignment(); - if( firstParagraphDirection ) - { - switch( horizontalAlignment ) - { - case LayoutEngine::HORIZONTAL_ALIGN_BEGIN: - { - horizontalAlignment = LayoutEngine::HORIZONTAL_ALIGN_END; - break; - } - case LayoutEngine::HORIZONTAL_ALIGN_CENTER: - { - // Nothing to do. - break; - } - case LayoutEngine::HORIZONTAL_ALIGN_END: - { - horizontalAlignment = LayoutEngine::HORIZONTAL_ALIGN_BEGIN; - break; - } - } - } - - switch( horizontalAlignment ) - { - case LayoutEngine::HORIZONTAL_ALIGN_BEGIN: - { - mImpl->mAlignmentOffset.x = 0.f; - break; - } - case LayoutEngine::HORIZONTAL_ALIGN_CENTER: - { - mImpl->mAlignmentOffset.x = floorf( 0.5f * ( controlSize.width - layoutSize.width ) ); // try to avoid pixel alignment. - break; - } - case LayoutEngine::HORIZONTAL_ALIGN_END: - { - mImpl->mAlignmentOffset.x = controlSize.width - layoutSize.width; - break; - } - } - } - - 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 * ( controlSize.height - layoutSize.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 = controlSize.height - layoutSize.height; + mImpl->mScrollPosition.y = controlSize.height - layoutSize.height; break; } } @@ -1734,9 +1991,13 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) textChanged = true; } - if( ( mImpl->mEventData->mState != EventData::INTERRUPTED ) && - ( mImpl->mEventData->mState != EventData::INACTIVE ) ) + if ( ( mImpl->mEventData->mState != EventData::INTERRUPTED ) && + ( mImpl->mEventData->mState != EventData::INACTIVE ) && + ( Dali::DALI_KEY_SHIFT_LEFT != keyCode ) ) { + // Should not change the state if the key is the shift send by the imf manager. + // Otherwise, when the state is SELECTING the text controller can't send the right + // surrounding info to the imf. mImpl->ChangeState( EventData::EDITING ); } @@ -1771,26 +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->mPreEditFlag && - ( 0u != mImpl->mEventData->mPreEditLength ) ) + // Remove the previous IMF pre-edit. + if( mImpl->mEventData->mPreEditFlag && ( 0u != mImpl->mEventData->mPreEditLength ) ) { - const 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 = 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 @@ -1859,10 +2122,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; @@ -1944,11 +2208,18 @@ 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 ); } + const Length numberOfCharacters = mImpl->IsShowingRealText() ? mImpl->mLogicalModel->mText.Count() : 0u; + if( ( 0u == mImpl->mLogicalModel->mText.Count() ) && mImpl->IsPlaceholderAvailable() ) { @@ -1962,6 +2233,16 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ { // 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 ) @@ -2007,10 +2288,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 ) ) @@ -2237,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 ) @@ -2255,12 +2541,6 @@ void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Butt mImpl->SendSelectionToClipboard( true ); // Synchronous call to modify text mImpl->mOperationsPending = ALL_OPERATIONS; - // This is to reset the virtual keyboard to Upper-case - if( 0u == mImpl->mLogicalModel->mText.Count() ) - { - NotifyImfManager(); - } - if( ( 0u != mImpl->mLogicalModel->mText.Count() ) || !mImpl->IsPlaceholderAvailable() ) { @@ -2269,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; @@ -2320,33 +2603,36 @@ void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Butt ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent ) { - bool update = false; + // Whether the text needs to be relaid-out. bool requestRelayout = false; - std::string text; - unsigned int cursorPosition = 0u; + // Whether to retrieve the text and cursor position to be sent to the IMF manager. + bool retrieveText = false; + bool retrieveCursor = false; switch( imfEvent.eventName ) { case ImfManager::COMMIT: { InsertText( imfEvent.predictiveString, Text::Controller::COMMIT ); - update = true; requestRelayout = true; + retrieveCursor = true; break; } case ImfManager::PREEDIT: { InsertText( imfEvent.predictiveString, Text::Controller::PRE_EDIT ); - update = true; requestRelayout = true; + retrieveCursor = true; break; } case ImfManager::DELETESURROUNDING: { - update = RemoveText( imfEvent.cursorOffset, imfEvent.numberOfChars ); + const bool textDeleted = RemoveText( imfEvent.cursorOffset, + imfEvent.numberOfChars, + DONT_UPDATE_INPUT_STYLE ); - if( update ) + if( textDeleted ) { if( ( 0u != mImpl->mLogicalModel->mText.Count() ) || !mImpl->IsPlaceholderAvailable() ) @@ -2356,19 +2642,19 @@ ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, cons else { ShowPlaceholderText(); - mImpl->mEventData->mUpdateCursorPosition = true; } + mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->mEventData->mScrollAfterDelete = true; + + requestRelayout = true; + retrieveCursor = 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: @@ -2378,12 +2664,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; @@ -2393,7 +2673,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; } @@ -2424,16 +2729,13 @@ 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() ) || !mImpl->IsPlaceholderAvailable() ) { @@ -2442,30 +2744,14 @@ bool Controller::BackspaceKeyEvent() else { ShowPlaceholderText(); - mImpl->mEventData->mUpdateCursorPosition = true; } + mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->mEventData->mScrollAfterDelete = true; } return removed; } -void Controller::NotifyImfManager() -{ - if( NULL != mImpl->mEventData ) - { - if( mImpl->mEventData->mImfManager ) - { - // Notifying IMF of a cursor change triggers a surrounding text request so updating it now. - std::string text; - GetText( text ); - mImpl->mEventData->mImfManager.SetSurroundingText( text ); - - mImpl->mEventData->mImfManager.SetCursorPosition( GetLogicalCursorPosition() ); - mImpl->mEventData->mImfManager.NotifyCursorPosition(); - } - } -} - void Controller::ShowPlaceholderText() { if( mImpl->IsPlaceholderAvailable() ) @@ -2500,9 +2786,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 @@ -2517,6 +2805,9 @@ void Controller::ShowPlaceholderText() 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; @@ -2531,41 +2822,30 @@ void Controller::ShowPlaceholderText() } } -void Controller::ClearModelData() -{ - // 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->mColorRuns.Clear(); - mImpl->mVisualModel->ClearCaches(); -} - 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(); + 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::ClearStyleData()