X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-model.cpp;h=e133e818eda06893b83836ad81b4acd1ad105cd8;hb=refs%2Ftags%2Fdali_1.2.61;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..e133e81 100755 --- a/dali-toolkit/internal/text/text-model.cpp +++ b/dali-toolkit/internal/text/text-model.cpp @@ -47,12 +47,12 @@ 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; } @@ -162,9 +162,9 @@ 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 ), + mLineWrapMode( Text::LineWrap::WORD ), mAlignmentOffset( 0.0f ), mElideEnabled( false ) {