X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fdecorator%2Ftext-decorator.h;h=83388f4bb36c32eaa15166ceb69bd7454f411b86;hb=c5660eb8cf963f8fc7b34bebeb9df827af7349ec;hp=4bcd012519449d11f5121c5e2bdbe48719dc0e17;hpb=f192f133e279e2687a4384561be87a8770abc235;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/text/decorator/text-decorator.h b/dali-toolkit/internal/text/decorator/text-decorator.h
index 4bcd012..83388f4 100644
--- a/dali-toolkit/internal/text/decorator/text-decorator.h
+++ b/dali-toolkit/internal/text/decorator/text-decorator.h
@@ -284,7 +284,7 @@ public:
   /**
    * @brief Retrieves the blink-interval for a cursor.
    *
-   * @return The cursor blink-interval.
+   * @return The cursor blink-interval in seconds.
    */
   float GetCursorBlinkInterval() const;
 
@@ -298,7 +298,7 @@ public:
   /**
    * @brief Retrieves the blink-duration for a cursor.
    *
-   * @return The cursor blink-duration.
+   * @return The cursor blink-duration in seconds.
    */
   float GetCursorBlinkDuration() const;
 
@@ -435,7 +435,7 @@ public:
   void SetSelectionHandleFlipState( bool indicesSwapped, bool left, bool right );
 
   /**
-   * @brief Adds a quad to the existing selection highlights.
+   * @brief Adds a quad to the existing selection highlights. Vertices are in decorator's coordinates.
    *
    * @param[in] x1 The top-left x position.
    * @param[in] y1 The top-left y position.
@@ -445,6 +445,18 @@ public:
   void AddHighlight( float x1, float y1, float x2, float y2 );
 
   /**
+   * @brief Sets the min 'x,y' coordinates and the size of the highlighted box.
+   *
+   * It's used to set the size and position of the highlight's actor and to translate each highlight quad from
+   * decorator's coordinates to the local coords of the highlight's actor.
+   *
+   * @param[in] position The position of the highlighted text in decorator's coords.
+   * @param[in] size The size of the highlighted text.
+   */
+  void SetHighLightBox( const Vector2& position,
+                        const Size& size );
+
+  /**
    * @brief Removes all of the previously added highlights.
    */
   void ClearHighlights();
@@ -464,6 +476,20 @@ public:
   const Vector4& GetHighlightColor() const;
 
   /**
+   * @brief Sets whether the highlight is active.
+   *
+   * @param[in] active Whether the highlight is active.
+   */
+  void SetHighlightActive( bool active );
+
+  /**
+   * @brief Retrieves whether the highlight is active.
+   *
+   * @return @e true if the highlight is active, @e false otherwise.
+   */
+  bool IsHighlightActive() const;
+
+  /**
    * @brief Sets into the decorator the depth used to render the text.
    *
    * @param[in] depth The text's depth.
@@ -501,14 +527,14 @@ public:
    * It defines a square area inside the control, close to the edge.
    * When the cursor enters this area, the decorator starts to send scroll events.
    *
-   * @param[in] threshold The scroll threshold.
+   * @param[in] threshold The scroll threshold in pixels.
    */
   void SetScrollThreshold( float threshold );
 
   /**
    * @brief Retrieves the scroll threshold.
    *
-   * @retunr The scroll threshold.
+   * @retunr The scroll threshold in pixels.
    */
   float GetScrollThreshold() const;
 
@@ -517,14 +543,14 @@ public:
    *
    * Is the distance the text is going to be scrolled during a scroll interval.
    *
-   * @param[in] speed The scroll speed.
+   * @param[in] speed The scroll speed in pixels/second.
    */
   void SetScrollSpeed( float speed );
 
   /**
    * @brief Retrieves the scroll speed.
    *
-   * @return The scroll speed.
+   * @return The scroll speed in pixels/second.
    */
   float GetScrollSpeed() const;
 
@@ -533,6 +559,36 @@ public:
    */
   void NotifyEndOfScroll();
 
+  /**
+   * @copydoc Text::Controller::SetHorizontalScrollEnabled()
+   */
+  void SetHorizontalScrollEnabled( bool enable );
+
+  /**
+   * @copydoc Text::Controller::IsHorizontalScrollEnabled()
+   */
+  bool IsHorizontalScrollEnabled() const;
+
+  /**
+   * @copydoc Text::Controller::SetVerticalScrollEnabled()
+   */
+  void SetVerticalScrollEnabled( bool enable );
+
+  /**
+   * @copydoc Text::Controller::IsVerticalScrollEnabled()
+   */
+  bool IsVerticalScrollEnabled() const;
+
+  /**
+   * @copydoc Text::Controller::SetSmoothHandlePanEnabled()
+   */
+  void SetSmoothHandlePanEnabled( bool enable );
+
+  /**
+   * @copydoc Text::Controller::IsSmoothHandlePanEnabled()
+   */
+  bool IsSmoothHandlePanEnabled() const;
+
 protected:
 
   /**