Merge "Fixed cursor behavior when no text is set" into devel/master

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

diff --git a/dali-toolkit/internal/text/decorator/text-decorator.h b/dali-toolkit/internal/text/decorator/text-decorator.h
index c77ec94..ae90e90 100644 (file)
--- a/dali-toolkit/internal/text/decorator/text-decorator.h
+++ b/dali-toolkit/internal/text/decorator/text-decorator.h
@@ -22,7 +22,6 @@
 #include <dali/public-api/common/intrusive-ptr.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/math/rect.h>
-#include <dali/public-api/math/vector2.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h>
@@ -30,21 +29,12 @@
 namespace Dali
 {
 
-class Actor;
-class Image;
-class Vector2;
-class Vector4;
+struct Vector2;
+struct Vector4;
 
 namespace Toolkit
 {
 
-class TextSelectionPopupCallbackInterface;
-
-namespace Internal
-{
-class Control;
-}
-
 namespace Text
 {
 
@@ -91,6 +81,8 @@ enum HandleType
   GRAB_HANDLE,
   LEFT_SELECTION_HANDLE,
   RIGHT_SELECTION_HANDLE,
+  LEFT_SELECTION_HANDLE_MARKER,
+  RIGHT_SELECTION_HANDLE_MARKER,
   HANDLE_TYPE_COUNT
 };
 
@@ -306,6 +298,20 @@ public:
   float GetCursorBlinkDuration() const;
 
   /**
+   * @brief Sets the width of the cursors.
+   *
+   * @param[in] width The width of the cursor in pixels.
+   */
+  void SetCursorWidth( int width );
+
+  /**
+   * @brief Retrieves the width of the cursors.
+   *
+   * @return The width of the cursors in pixels.
+   */
+  int GetCursorWidth() const;
+
+  /**
    * @brief Sets whether a handle is active.
    *
    * @param[in] handleType One of the handles.