X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-model.cpp;h=7f23aac7eb144dcc3f292f2ccc5fa90f553981ad;hb=refs%2Fchanges%2F86%2F162386%2F28;hp=cf6f35c6b42bedcb3ec683457287389f07880514;hpb=44bb6ae11e1c189104d9a8c9881bd5e524b398c0;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/text-model.cpp b/dali-toolkit/internal/text/text-model.cpp index cf6f35c..7f23aac 100755 --- a/dali-toolkit/internal/text/text-model.cpp +++ b/dali-toolkit/internal/text/text-model.cpp @@ -47,16 +47,21 @@ const Vector2& Model::GetScrollPosition() const return mScrollPosition; } -Layout::HorizontalAlignment Model::GetHorizontalAlignment() const +HorizontalAlignment::Type Model::GetHorizontalAlignment() const { return mHorizontalAlignment; } -Layout::VerticalAlignment Model::GetVerticalAlignment() const +VerticalAlignment::Type Model::GetVerticalAlignment() const { return mVerticalAlignment; } +DevelText::VerticalLineAlignment::Type Model::GetVerticalLineAlignment() const +{ + return mVerticalLineAlignment; +} + bool Model::IsTextElideEnabled() const { return mElideEnabled; @@ -122,6 +127,11 @@ const Vector4& Model::GetShadowColor() const return mVisualModel->mShadowColor; } +const float& Model::GetShadowBlurRadius() const +{ + return mVisualModel->mShadowBlurRadius; +} + const Vector4& Model::GetUnderlineColor() const { return mVisualModel->GetUnderlineColor(); @@ -162,9 +172,10 @@ Model::Model() mVisualModel(), mScrollPosition(), mScrollPositionLast(), - mHorizontalAlignment( Layout::HORIZONTAL_ALIGN_BEGIN ), - mVerticalAlignment( Layout::VERTICAL_ALIGN_TOP ), - mLineWrapMode( Layout::LineWrap::WORD ), + mHorizontalAlignment( Text::HorizontalAlignment::BEGIN ), + mVerticalAlignment( Text::VerticalAlignment::TOP ), + mVerticalLineAlignment( DevelText::VerticalLineAlignment::TOP ), + mLineWrapMode( Text::LineWrap::WORD ), mAlignmentOffset( 0.0f ), mElideEnabled( false ) {