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 "Note that some Text propeties in devel api can't be changed" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
text-controls
/
text-label-devel.h
diff --git
a/dali-toolkit/devel-api/controls/text-controls/text-label-devel.h
b/dali-toolkit/devel-api/controls/text-controls/text-label-devel.h
index
2721dc1
..
2b53fc5
100644
(file)
--- a/
dali-toolkit/devel-api/controls/text-controls/text-label-devel.h
+++ b/
dali-toolkit/devel-api/controls/text-controls/text-label-devel.h
@@
-92,7
+92,13
@@
namespace Property
* @details name "lineCount", type int
* @node this property is read-only.
*/
* @details name "lineCount", type int
* @node this property is read-only.
*/
- LINE_COUNT = OUTLINE + 5
+ LINE_COUNT = OUTLINE + 5,
+
+ /**
+ * @brief line wrap mode when the text lines over layout width.
+ * @details name "lineWrapMode", type string.
+ */
+ LINE_WRAP_MODE = OUTLINE + 6
};
} // namespace Property
};
} // namespace Property