X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fdecorator%2Ftext-decorator.h;h=14e121285e8918caea061ec332a4c13b8ec8c78e;hp=939c8158b24045ff84c4814a807dbdefef9a1226;hb=6c8205c3864658abbd163f61e27e9a7609dd4cbb;hpb=21eabe4bf9ae87c14bf28c18c68d58393eac5a92 diff --git a/dali-toolkit/internal/text/decorator/text-decorator.h b/dali-toolkit/internal/text/decorator/text-decorator.h index 939c815..14e1212 100644 --- a/dali-toolkit/internal/text/decorator/text-decorator.h +++ b/dali-toolkit/internal/text/decorator/text-decorator.h @@ -167,9 +167,15 @@ public: * @brief The decorator waits until a relayout before creating actors etc. * * @param[in] size The size of the parent control after size-negotiation. - * @param[in] scrollPosition The cursor, grab-handle positions etc. should be offset by this. */ - void Relayout( const Dali::Vector2& size, const Vector2& scrollPosition ); + void Relayout( const Dali::Vector2& size ); + + /** + * @brief Updates the decorator's actor positions after scrolling. + * + * @param[in] scrollOffset The scroll offset. + */ + void UpdatePositions( const Vector2& scrollOffset ); /** * @brief Sets which of the cursors are active. @@ -198,7 +204,7 @@ public: void SetPosition( Cursor cursor, float x, float y, float cursorHeight, float lineHeight ); /** - * @brief Retrieves the position of a cursor. + * @brief Retrieves the position, height and lineHeight of a cursor. * * @param[in] cursor The cursor to get. * @param[out] x The x position relative to the top-left of the parent control. @@ -209,6 +215,15 @@ public: void GetPosition( Cursor cursor, float& x, float& y, float& cursorHeight, float& lineHeight ) const; /** + * @brief Retrieves the position of a cursor. + * + * @param[in] cursor The cursor to get. + * + * @return The position. + */ + const Vector2& GetPosition( Cursor cursor ) const; + + /** * @brief Sets the color for a cursor. * * @param[in] cursor Whether this color is for the primary or secondary cursor. @@ -371,7 +386,6 @@ public: */ bool IsPopupActive() const; - protected: /**