Merge "Added IGNORE_SPACES_AFTER_TEXT property" into 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 9422996..1ea725c 100755 (executable)
--- 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) 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.
@@ -193,6 +193,16 @@ public:
    */
   virtual float GetOutlineWidth() const;
 
+  /**
+   * @copydoc ModelInterface::GetBackgroundColor()
+   */
+  virtual const Vector4& GetBackgroundColor() const;
+
+  /**
+   * @copydoc ModelInterface::IsBackgroundEnabled()
+   */
+  virtual bool IsBackgroundEnabled() const;
+
 private: // Private contructors & copy operator.
 
   /**
@@ -220,14 +230,15 @@ 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
-  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.
+  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.
 };
 
 } // namespace Text