X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller.cpp;h=4f866785837cd75b227a4dfb8592d4a2665de2b4;hb=c453a0b73b48a76d5f28529553bdd5275cb20f75;hp=2a3631fe8bd45d5d15e394f6f0ee8454f3226d11;hpb=c25b3c40178dadf12dc5e8f77c17413df0a55099;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index 2a3631f..4f86678 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -987,8 +987,9 @@ struct Controller::Impl // Set the text properties to default mVisualModel->SetTextColor( Color::WHITE ); mVisualModel->SetShadowOffset( Vector2::ZERO ); - mVisualModel->SetShadowColor( Vector4::ZERO ); + mVisualModel->SetShadowColor( Color::BLACK ); mVisualModel->SetUnderlineEnabled( false ); + mVisualModel->SetUnderlineHeight( 0.0f ); } ~Impl() @@ -1212,6 +1213,11 @@ bool Controller::IsUnderlineEnabled() const return mImpl->mVisualModel->IsUnderlineEnabled(); } +float Controller::GetUnderlineHeight() const +{ + return mImpl->mVisualModel->GetUnderlineHeight(); +} + void Controller::SetTextColor( const Vector4& textColor ) { mImpl->mVisualModel->SetTextColor( textColor ); @@ -1237,6 +1243,11 @@ void Controller::SetUnderlineEnabled( bool enabled ) mImpl->mVisualModel->SetUnderlineEnabled( enabled ); } +void Controller::SetUnderlineHeight( float height ) +{ + mImpl->mVisualModel->SetUnderlineHeight( height ); +} + void Controller::EnableTextInput( DecoratorPtr decorator ) { if( !mImpl->mTextInput ) @@ -1804,6 +1815,7 @@ bool Controller::DoRelayout( const Size& size, Vector& lineBreakInfo = mImpl->mLogicalModel->mLineBreakInfo; Vector& wordBreakInfo = mImpl->mLogicalModel->mWordBreakInfo; + Vector& characterDirection = mImpl->mLogicalModel->mCharacterDirections; Vector& glyphs = mImpl->mVisualModel->mGlyphs; Vector& glyphsToCharactersMap = mImpl->mVisualModel->mGlyphsToCharacters; Vector& charactersPerGlyph = mImpl->mVisualModel->mCharactersPerGlyph; @@ -1813,6 +1825,7 @@ bool Controller::DoRelayout( const Size& size, mImpl->mLogicalModel->mText.Begin(), lineBreakInfo.Begin(), wordBreakInfo.Begin(), + ( 0u != characterDirection.Count() ) ? characterDirection.Begin() : NULL, numberOfGlyphs, glyphs.Begin(), glyphsToCharactersMap.Begin(),