X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-model.cpp;h=7b6536dc883b0e6aa0250c155b6599ca4a599f80;hb=d00467f4821a9d7509d195473c5a482a1e9a5200;hp=2c00cf8be89e757445f9508f9b877a9617e444e2;hpb=58ae307297125b55c93c38a631a8745c6a7c51f1;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 old mode 100644 new mode 100755 index 2c00cf8..7b6536d --- 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; } @@ -122,6 +122,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(); @@ -147,14 +152,24 @@ 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 ), - mLineWrapMode( Layout::LineWrap::WORD ), + mHorizontalAlignment( Text::HorizontalAlignment::BEGIN ), + mVerticalAlignment( Text::VerticalAlignment::TOP ), + mLineWrapMode( Text::LineWrap::WORD ), mAlignmentOffset( 0.0f ), mElideEnabled( false ) {