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=c1767d8f5f467c6150779fb95b4c727d36fd2b62;hp=7f23aac7eb144dcc3f292f2ccc5fa90f553981ad;hb=bb9b5c8a2b3f0ce6bcf368e3bdea380d65353b1f;hpb=2ef1ec2dc06370b206f95db44c0a59259ce2f7d1 diff --git a/dali-toolkit/internal/text/text-model.cpp b/dali-toolkit/internal/text/text-model.cpp index 7f23aac..c1767d8 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. @@ -112,6 +112,16 @@ const ColorIndex* const Model::GetColorIndices() const return mVisualModel->mColorIndices.Begin(); } +const Vector4* const Model::GetBackgroundColors() const +{ + return mVisualModel->mBackgroundColors.Begin(); +} + +const ColorIndex* const Model::GetBackgroundColorIndices() const +{ + return mVisualModel->mBackgroundColorIndices.Begin(); +} + const Vector4& Model::GetDefaultColor() const { return mVisualModel->mTextColor; @@ -162,11 +172,21 @@ const Vector4& Model::GetOutlineColor() const return mVisualModel->GetOutlineColor(); } -float Model::GetOutlineWidth() const +uint16_t 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(), @@ -177,7 +197,9 @@ Model::Model() 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();