X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-model.cpp;h=474b3ae44937d9ceb7df05ff7b53ebb46e03c7eb;hb=85c7065a159374bac65ff799a0a977f930b8e694;hp=b31810a1a6c7c4419e98f56cf59468cdde63148c;hpb=eac074bfe3a3c144f55583135515d2c8d16eb479;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 b31810a..474b3ae 100755 --- a/dali-toolkit/internal/text/text-model.cpp +++ b/dali-toolkit/internal/text/text-model.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,6 +57,11 @@ VerticalAlignment::Type Model::GetVerticalAlignment() const return mVerticalAlignment; } +DevelText::VerticalLineAlignment::Type Model::GetVerticalLineAlignment() const +{ + return mVerticalLineAlignment; +} + bool Model::IsTextElideEnabled() const { return mElideEnabled; @@ -122,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(); @@ -157,16 +167,29 @@ float Model::GetOutlineWidth() const return mVisualModel->GetOutlineWidth(); } +const Vector4& Model::GetBackgroundColor() const +{ + return mVisualModel->GetBackgroundColor(); +} + +bool Model::IsBackgroundEnabled() const +{ + return mVisualModel->IsBackgroundEnabled(); +} + Model::Model() : mLogicalModel(), mVisualModel(), mScrollPosition(), mScrollPositionLast(), - mHorizontalAlignment( HorizontalAlignment::BEGIN ), - mVerticalAlignment( VerticalAlignment::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 ) + mElideEnabled( false ), + mIgnoreSpacesAfterText( true ), + mMatchSystemLanguageDirection( false ) { mLogicalModel = LogicalModel::New(); mVisualModel = VisualModel::New();