X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-model.cpp;h=b31810a1a6c7c4419e98f56cf59468cdde63148c;hp=cf6f35c6b42bedcb3ec683457287389f07880514;hb=refs%2Fchanges%2F97%2F153897%2F12;hpb=f090b040537e2a5a60a6dc80009ade9b72d37d4b diff --git a/dali-toolkit/internal/text/text-model.cpp b/dali-toolkit/internal/text/text-model.cpp index cf6f35c..b31810a 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,8 +162,8 @@ Model::Model() mVisualModel(), mScrollPosition(), mScrollPositionLast(), - mHorizontalAlignment( Layout::HORIZONTAL_ALIGN_BEGIN ), - mVerticalAlignment( Layout::VERTICAL_ALIGN_TOP ), + mHorizontalAlignment( HorizontalAlignment::BEGIN ), + mVerticalAlignment( VerticalAlignment::TOP ), mLineWrapMode( Layout::LineWrap::WORD ), mAlignmentOffset( 0.0f ), mElideEnabled( false )