Text Alignment Enums now public

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / text-model.cpp

diff --git a/dali-toolkit/internal/text/text-model.cpp b/dali-toolkit/internal/text/text-model.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 2c00cf8..b31810a
--- 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;
 }
@@ -147,13 +147,23 @@ 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 ),
+  mHorizontalAlignment( HorizontalAlignment::BEGIN ),
+  mVerticalAlignment( VerticalAlignment::TOP ),
   mLineWrapMode( Layout::LineWrap::WORD ),
   mAlignmentOffset( 0.0f ),
   mElideEnabled( false )