std::string text;
};
+const std::string EMPTY_STRING("");
+
} // namespace
namespace Dali
FontId defaultFontId = 0u;
if( NULL == mFontDefaults )
{
- defaultFontId = mFontClient.GetFontId( String::EMPTY,
- String::EMPTY );
+ defaultFontId = mFontClient.GetFontId( EMPTY_STRING,
+ EMPTY_STRING );
}
else
{
mVisualModel->SetShadowOffset( Vector2::ZERO );
mVisualModel->SetShadowColor( Vector4::ZERO );
mVisualModel->SetUnderlineEnabled( false );
- mVisualModel->SetUnderlineHeight( 0.0f );
}
~Impl()
return mImpl->mFontDefaults->mDefaultFontFamily;
}
- return String::EMPTY;;
+ return EMPTY_STRING;
}
void Controller::SetDefaultFontStyle( const std::string& defaultFontStyle )
return mImpl->mFontDefaults->mDefaultFontStyle;
}
- return String::EMPTY;
+ return EMPTY_STRING;
}
void Controller::SetDefaultPointSize( float pointSize )
return mImpl->mVisualModel->IsUnderlineEnabled();
}
-float Controller::GetUnderlineHeight() const
-{
- return mImpl->mVisualModel->GetUnderlineHeight();
-}
-
void Controller::SetTextColor( const Vector4& textColor )
{
mImpl->mVisualModel->SetTextColor( textColor );
mImpl->mVisualModel->SetUnderlineEnabled( enabled );
}
-void Controller::SetUnderlineHeight( float height )
-{
- mImpl->mVisualModel->SetUnderlineHeight( height );
-}
-
void Controller::EnableTextInput( DecoratorPtr decorator )
{
if( !mImpl->mTextInput )
Vector<LineBreakInfo>& lineBreakInfo = mImpl->mLogicalModel->mLineBreakInfo;
Vector<WordBreakInfo>& wordBreakInfo = mImpl->mLogicalModel->mWordBreakInfo;
+ Vector<CharacterDirection>& characterDirection = mImpl->mLogicalModel->mCharacterDirections;
Vector<GlyphInfo>& glyphs = mImpl->mVisualModel->mGlyphs;
Vector<CharacterIndex>& glyphsToCharactersMap = mImpl->mVisualModel->mGlyphsToCharacters;
Vector<Length>& charactersPerGlyph = mImpl->mVisualModel->mCharactersPerGlyph;
mImpl->mLogicalModel->mText.Begin(),
lineBreakInfo.Begin(),
wordBreakInfo.Begin(),
+ ( 0u != characterDirection.Count() ) ? characterDirection.Begin() : NULL,
numberOfGlyphs,
glyphs.Begin(),
glyphsToCharactersMap.Begin(),