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=219aae8480228d1f97ef5c53a7c98c69b773bc74;hp=765dd317069ae58019719617f90078daf9baa318;hb=528aa3699cd51dab5115bca1aaebb65d4bc67c15;hpb=5f58a4de80835daf8db03a9e6b9c04cf5f556831

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 765dd31..219aae8
--- a/dali-toolkit/internal/text/text-model.h
+++ b/dali-toolkit/internal/text/text-model.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_MODEL_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -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/logical-model-impl.h>
 #include <dali-toolkit/internal/text/text-model-interface.h>
 #include <dali-toolkit/internal/text/visual-model-impl.h>
@@ -61,72 +61,157 @@ public:
   /**
    * @copydoc ModelInterface::GetControlSize()
    */
-  virtual const Size& GetControlSize() const;
+  const Size& GetControlSize() const override;
 
   /**
    * @copydoc ModelInterface::GetLayoutSize()
    */
-  virtual const Size& GetLayoutSize() const;
+  const Size& GetLayoutSize() const override;
 
   /**
    * @copydoc ModelInterface::GetScrollPosition()
    */
-  virtual const Vector2& GetScrollPosition() const;
+  const Vector2& GetScrollPosition() const override;
 
   /**
    * @copydoc ModelInterface::GetHorizontalAlignment()
    */
-  virtual Layout::HorizontalAlignment GetHorizontalAlignment() const;
+  HorizontalAlignment::Type GetHorizontalAlignment() const override;
 
   /**
    * @copydoc ModelInterface::GetVerticalAlignment()
    */
-  virtual Layout::VerticalAlignment GetVerticalAlignment() const;
+  VerticalAlignment::Type GetVerticalAlignment() const override;
+
+  /**
+   * @copydoc ModelInterface::GetVerticalLineAlignment()
+   */
+  DevelText::VerticalLineAlignment::Type GetVerticalLineAlignment() const override;
 
   /**
    * @copydoc ModelInterface::IsTextElideEnabled()
    */
-  virtual bool IsTextElideEnabled() const;
+  bool IsTextElideEnabled() const override;
 
   /**
    * @copydoc ModelInterface::GetNumberOfLines()
    */
-  virtual Length GetNumberOfLines() const;
+  Length GetNumberOfLines() const override;
 
   /**
    * @copydoc ModelInterface::GetLines()
    */
-  virtual const LineRun* const GetLines() const;
+  const LineRun* const GetLines() const override;
+
+  /**
+   * @copydoc ModelInterface::GetNumberOfScripts()
+   */
+  Length GetNumberOfScripts() const override;
+
+  /**
+   * @copydoc ModelInterface::GetScriptRuns()
+   */
+  const ScriptRun* const GetScriptRuns() const override;
 
   /**
    * @copydoc ModelInterface::GetNumberOfGlyphs()
    */
-  virtual Length GetNumberOfGlyphs() const;
+  Length GetNumberOfGlyphs() const override;
 
   /**
    * @copydoc ModelInterface::GetGlyphs()
    */
-  virtual const GlyphInfo* const GetGlyphs() const;
+  const GlyphInfo* const GetGlyphs() const override;
 
   /**
    * @copydoc ModelInterface::GetLayout()
    */
-  virtual const Vector2* const GetLayout() const;
+  const Vector2* const GetLayout() const override;
 
   /**
    * @copydoc ModelInterface::GetColors()
    */
-  virtual const Vector4* const GetColors() const;
+  const Vector4* const GetColors() const override;
 
   /**
    * @copydoc ModelInterface::GetColorIndices()
    */
-  virtual const ColorIndex* const GetColorIndices() const;
+  const ColorIndex* const GetColorIndices() const override;
+
+  /**
+   * @copydoc ModelInterface::GetBackgroundColors()
+   */
+  const Vector4* const GetBackgroundColors() const override;
+
+  /**
+   * @copydoc ModelInterface::GetBackgroundColorIndices()
+   */
+  const ColorIndex* const GetBackgroundColorIndices() const override;
 
   /**
    * @copydoc ModelInterface::GetDefaultColor()
    */
-  virtual const Vector4& GetDefaultColor() const;
+  const Vector4& GetDefaultColor() const override;
+
+  /**
+   * @copydoc ModelInterface::GetShadowOffset()
+   */
+  const Vector2& GetShadowOffset() const override;
+
+  /**
+   * @copydoc ModelInterface::GetShadowColor()
+   */
+  const Vector4& GetShadowColor() const override;
+
+  /**
+   * @copydoc ModelInterface::GetShadowBlurRadius()
+   */
+  const float& GetShadowBlurRadius() const override;
+
+  /**
+   * @copydoc ModelInterface::GetUnderlineColor()
+   */
+  const Vector4& GetUnderlineColor() const override;
+
+  /**
+   * @copydoc ModelInterface::IsUnderlineEnabled()
+   */
+  bool IsUnderlineEnabled() const override;
+
+  /**
+   * @copydoc ModelInterface::GetUnderlineHeight()
+   */
+  float GetUnderlineHeight() const override;
+
+  /**
+   * @copydoc ModelInterface::GetNumberOfUnderlineRuns()
+   */
+  Length GetNumberOfUnderlineRuns() const override;
+
+  /**
+   * @copydoc ModelInterface::GetUnderlineRuns()
+   */
+  void GetUnderlineRuns( GlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns ) const override;
+
+  /**
+   * @copydoc ModelInterface::GetOutlineColor()
+   */
+  const Vector4& GetOutlineColor() const override;
+
+  /**
+   * @copydoc ModelInterface::GetOutlineWidth()
+   */
+  uint16_t GetOutlineWidth() const override;
+
+  /**
+   * @copydoc ModelInterface::GetBackgroundColor()
+   */
+  const Vector4& GetBackgroundColor() const override;
+
+  /**
+   * @copydoc ModelInterface::IsBackgroundEnabled()
+   */
+  bool IsBackgroundEnabled() const override;
 
 private: // Private contructors & copy operator.
 
@@ -155,10 +240,16 @@ 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.
-  Layout::HorizontalAlignment mHorizontalAlignment; ///< The layout's horizontal alignment.
-  Layout::VerticalAlignment   mVerticalAlignment;   ///< The layout's vertical alignment.
-  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.
+  DevelText::VerticalLineAlignment::Type    mVerticalLineAlignment;   ///< The layout's vertical line alignment.
+  Text::LineWrap::Mode                      mLineWrapMode;            ///< The text wrap mode
+  float                                     mAlignmentOffset;         ///< The alignment offset.
+  bool                                      mElideEnabled:1;          ///< Whether the text's elide is enabled.
+  bool                                      mIgnoreSpacesAfterText:1; ///< Whether ignoring spaces after text or not. Default is true.
+  bool                                      mMatchSystemLanguageDirection:1; ///< Whether match align for system language direction or not. Default is false.
 };
 
 } // namespace Text