X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-model.cpp;h=7f23aac7eb144dcc3f292f2ccc5fa90f553981ad;hb=47114de251a698fd86e88c3b810e437a5e3065a8;hp=05cb4051d833c1e55a5c7c947398625eddb90849;hpb=f5e86ed8fd10a19aaeac4be8703887ffa24fcf7f;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 05cb405..7f23aac --- 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; @@ -72,6 +77,16 @@ const LineRun* const Model::GetLines() const return mVisualModel->mLines.Begin(); } +Length Model::GetNumberOfScripts() const +{ + return mLogicalModel->mScriptRuns.Count(); +} + +const ScriptRun* const Model::GetScriptRuns() const +{ + return mLogicalModel->mScriptRuns.Begin(); +} + Length Model::GetNumberOfGlyphs() const { return mVisualModel->mGlyphs.Count(); @@ -112,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(); @@ -137,14 +157,25 @@ 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 ), + mVerticalLineAlignment( DevelText::VerticalLineAlignment::TOP ), + mLineWrapMode( Text::LineWrap::WORD ), mAlignmentOffset( 0.0f ), mElideEnabled( false ) {