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=2c00cf8be89e757445f9508f9b877a9617e444e2;hb=eac074bfe3a3c144f55583135515d2c8d16eb479;hpb=4d305b893731daafafc293b92dc4fa25a896e929 diff --git a/dali-toolkit/internal/text/text-model.cpp b/dali-toolkit/internal/text/text-model.cpp old mode 100644 new mode 100755 index 2c00cf8..b31810a --- 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; } @@ -147,13 +147,23 @@ void Model::GetUnderlineRuns( GlyphRun* underlineRuns, UnderlineRunIndex index, mVisualModel->GetUnderlineRuns( underlineRuns, index, numberOfRuns ); } +const Vector4& Model::GetOutlineColor() const +{ + return mVisualModel->GetOutlineColor(); +} + +float Model::GetOutlineWidth() const +{ + return mVisualModel->GetOutlineWidth(); +} + Model::Model() : mLogicalModel(), 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 )