GetNaturalSize() to restore ControlSize after relayouting, Scrolling Gap from float...

[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..d4f92b9 100644 (file)
--- a/dali-toolkit/internal/text/text-scroller.h
+++ b/dali-toolkit/internal/text/text-scroller.h
@@ -71,13 +71,13 @@ public:
    * @brief Set the gap distance to elapse before the text wraps around
    * @param[in] gap distance to elapse
    */
    * @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
    */
    * @return gap distance to elapse
    */

-  float GetGap() const;
+  int GetGap() const;

 
   /**
    * @brief Set speed the text should scroll
 
   /**
    * @brief Set speed the text should scroll


@@ -161,9 +161,9 @@ private:
   Property::Index    mScrollDeltaIndex;         // Property used by shader to represent distance to scroll
   Animation          mScrollAnimation;          // Animation used to update the mScrollDeltaIndex
 
   Property::Index    mScrollDeltaIndex;         // Property used by shader to represent distance to scroll
   Animation          mScrollAnimation;          // Animation used to update the mScrollDeltaIndex
 

-  int   mScrollSpeed;            ///< Speed which text should automatically scroll at
-  int   mLoopCount;              ///< Number of time the text should scroll
-  float mWrapGap;                ///< Gap before text wraps around when scrolling
+  int mScrollSpeed;            ///< Speed which text should automatically scroll at
+  int mLoopCount;              ///< Number of time the text should scroll
+  int mWrapGap;                ///< Gap before text wraps around when scrolling

 
 }; // TextScroller class
 
 
 }; // TextScroller class