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
Placeholder properties as enums
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
text-controls
/
text-label.h
diff --git
a/dali-toolkit/public-api/controls/text-controls/text-label.h
b/dali-toolkit/public-api/controls/text-controls/text-label.h
index
0de1b01
..
6536746
100644
(file)
--- a/
dali-toolkit/public-api/controls/text-controls/text-label.h
+++ b/
dali-toolkit/public-api/controls/text-controls/text-label.h
@@
-144,16
+144,18
@@
public:
/**
* @brief The line horizontal alignment.
/**
* @brief The line horizontal alignment.
- * @details Name "horizontalAlignment", type Property::STRING
+ * @details Name "horizontalAlignment", type Property::STRING
or type HorizontalAlignment::Type (Property::INTEGER)
* Values "BEGIN", "CENTER", "END", default BEGIN.
* Values "BEGIN", "CENTER", "END", default BEGIN.
+ * @note Return type is Property::STRING
* @SINCE_1_0.0
*/
HORIZONTAL_ALIGNMENT,
/**
* @brief The line vertical alignment.
* @SINCE_1_0.0
*/
HORIZONTAL_ALIGNMENT,
/**
* @brief The line vertical alignment.
- * @details Name "verticalAlignment", type Property::STRING.
+ * @details Name "verticalAlignment", type Property::STRING
or type VerticalAlignment::Type (Property::INTEGER)
.
* Values "TOP", "CENTER", "BOTTOM" @SINCE_1_0.0, default TOP.
* Values "TOP", "CENTER", "BOTTOM" @SINCE_1_0.0, default TOP.
+ * @note Return type is Property::STRING
* @SINCE_1_0.0
*/
VERTICAL_ALIGNMENT,
* @SINCE_1_0.0
*/
VERTICAL_ALIGNMENT,
@@
-318,8
+320,11
@@
public:
/**
* @brief Line wrap mode when text lines are greater than the layout width.
/**
* @brief Line wrap mode when text lines are greater than the layout width.
- * @details Name "lineWrapMode", type Property::STRING.
+ * @details Name "lineWrapMode", type
Text::LineWrap::Mode (Text::Property::INTEGER) or
Property::STRING.
* @SINCE_1_2.60
* @SINCE_1_2.60
+ * @note Default is Text::LineWrap::WORD.
+ * @note Return type is Text::LineWrap::Mode (Text::Property::INTEGER).
+ * @see Text::LineWrap
*/
LINE_WRAP_MODE,
*/
LINE_WRAP_MODE,