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
Merge "DALi Version 1.0.45" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
layouts
/
layout-engine.h
diff --git
a/dali-toolkit/internal/text/layouts/layout-engine.h
b/dali-toolkit/internal/text/layouts/layout-engine.h
index
0c17d68
..
e48de90
100644
(file)
--- a/
dali-toolkit/internal/text/layouts/layout-engine.h
+++ b/
dali-toolkit/internal/text/layouts/layout-engine.h
@@
-90,6
+90,18
@@
public:
unsigned int GetLayout() const;
/**
unsigned int GetLayout() const;
/**
+ * @brief Enable or disable the text ellipsis.
+ *
+ * @param[in] enabled Whether to enable the text ellipsis.
+ */
+ void SetTextEllipsisEnabled( bool enabled );
+
+ /**
+ * @return Whether the text ellipsis is enabled.
+ */
+ bool GetTextEllipsisEnabled() const;
+
+ /**
* @brief Choose the required text horizontal alignment.
*
* @param[in] alignment The required alignment.
* @brief Choose the required text horizontal alignment.
*
* @param[in] alignment The required alignment.
@@
-146,15
+158,11
@@
public:
/**
* @brief Aligns the laid out lines.
*
/**
* @brief Aligns the laid out lines.
*
- * @param[in] layoutParameters The parameters needed to layout the text.
* @param[in] layoutSize The size of the laid out the text.
* @param[in] layoutSize The size of the laid out the text.
- * @param[in] lines The laid-out lines.
- * @param[in,out] glyphPositions The positions of all the glyphs.
+ * @param[in,out] lines The laid-out lines.
*/
*/
- void Align( const LayoutParameters& layoutParameters,
- const Size& layoutSize,
- const Vector<LineRun>& lines,
- Vector<Vector2>& glyphPositions );
+ void Align( const Size& layoutSize,
+ Vector<LineRun>& lines );
private:
private: