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=65494e5ce0b43eb5489c7d3f68f73418ddcaa958;hp=7b6536dc883b0e6aa0250c155b6599ca4a599f80;hb=9346cf33ef49063185d54fbbfc186864d96c51ca;hpb=7d7b84a16b36c89cc171c48bc5f2527eee5674b4

diff --git a/dali-toolkit/internal/text/text-model.cpp b/dali-toolkit/internal/text/text-model.cpp
index 7b6536d..65494e5 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;
@@ -162,6 +167,16 @@ 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(),
@@ -169,9 +184,11 @@ Model::Model()
   mScrollPositionLast(),
   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 )
 {
   mLogicalModel = LogicalModel::New();
   mVisualModel = VisualModel::New();