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
Remove alignment from text controller.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller.h
diff --git
a/dali-toolkit/internal/text/text-controller.h
b/dali-toolkit/internal/text/text-controller.h
index
5a96349
..
53a5991
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller.h
+++ b/
dali-toolkit/internal/text/text-controller.h
@@
-174,6
+174,13
@@
public:
CharacterDirection GetAutoScrollDirection() const;
/**
CharacterDirection GetAutoScrollDirection() const;
/**
+ * @brief Get the alignment offset of the first line of text.
+ *
+ * @return The alignment offset.
+ */
+ float GetAutoScrollLineAlignment() const;
+
+ /**
* @brief Replaces any text previously set.
*
* @note This will be converted into UTF-32 when stored in the text model.
* @brief Replaces any text previously set.
*
* @note This will be converted into UTF-32 when stored in the text model.
@@
-552,13
+559,6
@@
public:
const Vector2& GetScrollPosition() const;
/**
const Vector2& GetScrollPosition() const;
/**
- * @brief Query the alignment offset.
- *
- * @return The alignmnet offset.
- */
- const Vector2& GetAlignmentOffset() const;
-
- /**
* @copydoc Control::GetNaturalSize()
*/
Vector3 GetNaturalSize();
* @copydoc Control::GetNaturalSize()
*/
Vector3 GetNaturalSize();
@@
-660,11
+660,11
@@
public:
LayoutEngine::VerticalAlignment GetVerticalAlignment() const;
/**
LayoutEngine::VerticalAlignment GetVerticalAlignment() const;
/**
- * @brief Calulates the
alignment of the whol
e text inside the bounding box.
+ * @brief Calulates the
vertical offset to align th
e text inside the bounding box.
*
* @param[in] size The size of the bounding box.
*/
*
* @param[in] size The size of the bounding box.
*/
- void Calculate
TextAlignmen
t( const Size& size );
+ void Calculate
VerticalOffse
t( const Size& size );
/**
* @brief Return the layout engine.
/**
* @brief Return the layout engine.