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.h;h=d4da2bc6ce8134bd3912730157ba8f57215b5e7b;hp=a7b0bb8adc6a5429e459a5b9578b666cedf34e90;hb=eac074bfe3a3c144f55583135515d2c8d16eb479;hpb=5d9d55db30babd7cb6662b1cab287c2ff74430d9

diff --git a/dali-toolkit/internal/text/text-model.h b/dali-toolkit/internal/text/text-model.h
old mode 100644
new mode 100755
index a7b0bb8..d4da2bc
--- a/dali-toolkit/internal/text/text-model.h
+++ b/dali-toolkit/internal/text/text-model.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/ref-object.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/layouts/layout-alignment.h>
+#include <dali-toolkit/public-api/text/text-enumerations.h>
 #include <dali-toolkit/internal/text/layouts/layout-wrap-mode.h>
 #include <dali-toolkit/internal/text/logical-model-impl.h>
 #include <dali-toolkit/internal/text/text-model-interface.h>
@@ -77,12 +77,12 @@ public:
   /**
    * @copydoc ModelInterface::GetHorizontalAlignment()
    */
-  virtual Layout::HorizontalAlignment GetHorizontalAlignment() const;
+  virtual HorizontalAlignment::Type GetHorizontalAlignment() const;
 
   /**
    * @copydoc ModelInterface::GetVerticalAlignment()
    */
-  virtual Layout::VerticalAlignment GetVerticalAlignment() const;
+  virtual VerticalAlignment::Type GetVerticalAlignment() const;
 
   /**
    * @copydoc ModelInterface::IsTextElideEnabled()
@@ -174,6 +174,16 @@ public:
    */
   virtual void GetUnderlineRuns( GlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns ) const;
 
+  /**
+   * @copydoc ModelInterface::GetOutlineColor()
+   */
+  virtual const Vector4& GetOutlineColor() const;
+
+  /**
+   * @copydoc ModelInterface::GetOutlineWidth()
+   */
+  virtual float GetOutlineWidth() const;
+
 private: // Private contructors & copy operator.
 
   /**
@@ -201,13 +211,13 @@ public:
    * 0,0 means that the top-left corner of the layout matches the top-left corner of the UI control.
    * Typically this will have a negative value with scrolling occurs.
    */
-  Vector2                     mScrollPosition;      ///< The text is offset by this position when scrolling.
-  Vector2                     mScrollPositionLast;  ///< The last offset value of mScrollPosition
-  Layout::HorizontalAlignment mHorizontalAlignment; ///< The layout's horizontal alignment.
-  Layout::VerticalAlignment   mVerticalAlignment;   ///< The layout's vertical alignment.
-  Layout::LineWrap::Mode      mLineWrapMode;        ///< The text wrap mode
-  float                       mAlignmentOffset;     ///< The alignment offset.
-  bool                        mElideEnabled:1;      ///< Whether the text's elide is enabled.
+  Vector2                            mScrollPosition;      ///< The text is offset by this position when scrolling.
+  Vector2                            mScrollPositionLast;  ///< The last offset value of mScrollPosition
+  HorizontalAlignment::Type          mHorizontalAlignment; ///< The layout's horizontal alignment.
+  VerticalAlignment::Type            mVerticalAlignment;   ///< The layout's vertical alignment.
+  Layout::LineWrap::Mode             mLineWrapMode;        ///< The text wrap mode
+  float                              mAlignmentOffset;     ///< The alignment offset.
+  bool                               mElideEnabled:1;      ///< Whether the text's elide is enabled.
 };
 
 } // namespace Text