projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make cursor invisible when exceeds the boundaries of the Text Control.
[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
939c815
..
14e1212
100644
(file)
--- 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.
* @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.
/**
* @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 );
/**
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.
*
* @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;
/**
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.
* @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;
*/
bool IsPopupActive() const;
-
protected:
/**
protected:
/**