[dali_2.3.24] Merge branch 'devel/master'

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

diff --git a/dali-toolkit/internal/text/text-model.h b/dali-toolkit/internal/text/text-model.h
index d21dbc7..5661035 100644 (file)
--- a/dali-toolkit/internal/text/text-model.h
+++ b/dali-toolkit/internal/text/text-model.h
@@ -245,6 +245,11 @@ public:
   void GetUnderlineRuns(UnderlinedGlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns) const override;
 
   /**
   void GetUnderlineRuns(UnderlinedGlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns) const override;
 
   /**

+   * @copydoc ModelInterface::GetOutlineOffset()
+   */
+  const Vector2& GetOutlineOffset() const override;
+
+  /**

    * @copydoc ModelInterface::GetOutlineColor()
    */
   const Vector4& GetOutlineColor() const override;
    * @copydoc ModelInterface::GetOutlineColor()
    */
   const Vector4& GetOutlineColor() const override;


@@ -255,6 +260,11 @@ public:
   uint16_t GetOutlineWidth() const override;
 
   /**
   uint16_t GetOutlineWidth() const override;
 
   /**

+   * @copydoc ModelInterface::GetOutlineBlurRadius()
+   */
+  const float& GetOutlineBlurRadius() const override;
+
+  /**

    * @copydoc ModelInterface::GetBackgroundColor()
    */
   const Vector4& GetBackgroundColor() const override;
    * @copydoc ModelInterface::GetBackgroundColor()
    */
   const Vector4& GetBackgroundColor() const override;


@@ -364,6 +374,31 @@ public:
    */
   const Vector<FontDescriptionRun>& GetFontDescriptionRuns() const override;
 
    */
   const Vector<FontDescriptionRun>& GetFontDescriptionRuns() const override;
 

+  /**
+   * @copydoc ModelInterface::IsRemoveFrontInset()
+   */
+  bool IsRemoveFrontInset() const override;
+
+  /**
+   * @copydoc ModelInterface::IsRemoveBackInset()
+   */
+  bool IsRemoveBackInset() const override;
+
+  /**
+   * @copydoc ModelInterface::IsCutoutEnabled()
+   */
+  bool IsCutoutEnabled() const override;
+
+  /**
+   * @copydoc ModelInterface::IsBackgroundWithCutoutEnabled()
+   */
+  const bool IsBackgroundWithCutoutEnabled() const override;
+
+  /**
+   * @copydoc ModelInterface::GetBackgroundColorWithCutout()
+   */
+  const Vector4& GetBackgroundColorWithCutout() const override;
+

 private: // Private contructors & copy operator.
   /**
    * @brief Private constructor.
 private: // Private contructors & copy operator.
   /**
    * @brief Private constructor.


@@ -398,8 +433,11 @@ public:
   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.
   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                                   mRemoveFrontInset : 1;      ///< Whether to ignore xBearing of the first glyph. Default is true.
+  bool                                   mRemoveBackInset : 1;       ///< Whether to ignore advance of the last glyph. Default is true.

   DevelText::MatchLayoutDirection        mMatchLayoutDirection;      ///< Whether to match text alignment with layout direction or not.
   DevelText::EllipsisPosition::Type      mEllipsisPosition;          ///< Where is the location the text elide
   DevelText::MatchLayoutDirection        mMatchLayoutDirection;      ///< Whether to match text alignment with layout direction or not.
   DevelText::EllipsisPosition::Type      mEllipsisPosition;          ///< Where is the location the text elide

+  Vector2                                mVisualTransformOffset;     ///< The offset of the layout based on the controller due to alignment.

 };
 
 } // namespace Text
 };
 
 } // namespace Text