Merge "DALi Version 1.2.39" into devel/master

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

diff --git a/dali-toolkit/internal/text/text-scroller.h b/dali-toolkit/internal/text/text-scroller.h
index aefecdf..7804a40 100644 (file)
--- a/dali-toolkit/internal/text/text-scroller.h
+++ b/dali-toolkit/internal/text/text-scroller.h
@@ -65,19 +65,19 @@ public:
    * @param[in] alignmentOffset alignment of source text
    *
    */
-  void SetParameters( Actor sourceActor, const Size& controlSize, const Size& offScreenSize, CharacterDirection direction, const Vector2 alignmentOffset );
+  void SetParameters( Actor sourceActor, const Size& controlSize, const Size& offScreenSize, CharacterDirection direction, float alignmentOffset );
 
   /**
    * @brief Set the gap distance to elapse before the text wraps around
    * @param[in] gap distance to elapse
    */
-  void SetGap( float gap );
+  void SetGap( int gap );
 
   /**
-   * @brief Get the distance before scrolling waps
+   * @brief Get the distance before scrolling wraps
    * @return gap distance to elapse
    */
-  float GetGap() const;
+  int GetGap() const;
 
   /**
    * @brief Set speed the text should scroll
@@ -104,6 +104,18 @@ public:
   int GetLoopCount() const;
 
   /**
+   * @brief Set the delay time of scroll animation loop
+   * @param[in] float delay time seconds of loops
+   */
+  void SetLoopDelay( float delay );
+
+  /**
+   * @brief Get the delay time of scroll
+   * @return float delay time seconds of loops
+   */
+  float GetLoopDelay() const;
+
+  /**
    * @brief Get the camera used to look at source, should be added to the parent of target actor.
    * @return camera Actor
    */
@@ -163,6 +175,7 @@ private:
 
   int   mScrollSpeed;            ///< Speed which text should automatically scroll at
   int   mLoopCount;              ///< Number of time the text should scroll
+  float mLoopDelay;              ///< Time delay of loop start
   float mWrapGap;                ///< Gap before text wraps around when scrolling
 
 }; // TextScroller class