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 "Remove Atlas usage from ImageVisual" into devel/master
[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
c9322aa
..
9c216c2
100644
(file)
--- a/
dali-toolkit/public-api/controls/text-controls/text-label.h
+++ b/
dali-toolkit/public-api/controls/text-controls/text-label.h
@@
-122,7
+122,7
@@
public:
/**
* @brief The single-line or multi-line layout option
/**
* @brief The single-line or multi-line layout option
- * @details name "multiLine", type
FLOAT, default SINGLE_LINE_BOX
+ * @details name "multiLine", type
BOOLEAN, default false
* @SINCE_1_0.0
*/
MULTI_LINE,
* @SINCE_1_0.0
*/
MULTI_LINE,
@@
-150,7
+150,7
@@
public:
/**
* @brief The drop shadow offset 0 indicates no shadow
/**
* @brief The drop shadow offset 0 indicates no shadow
- * @details name "shadowOffset", type VECTOR
4
+ * @details name "shadowOffset", type VECTOR
2
* @DEPRECATED_1_1.37 Use SHADOW instead
*/
SHADOW_OFFSET,
* @DEPRECATED_1_1.37 Use SHADOW instead
*/
SHADOW_OFFSET,
@@
-192,13
+192,13
@@
public:
/**
* @brief Start or stop auto scrolling,
/**
* @brief Start or stop auto scrolling,
- * @details name "enable
Markup
", type BOOLEAN, default is false
+ * @details name "enable
AutoScroll
", type BOOLEAN, default is false
* @SINCE_1_1.35
*/
ENABLE_AUTO_SCROLL,
/**
* @SINCE_1_1.35
*/
ENABLE_AUTO_SCROLL,
/**
- * @brief
Start or stop auto scrolling
,
+ * @brief
Sets the speed of scrolling in pixels per second
,
* @details name "autoScrollSpeed", type INT, default in style sheet
* @SINCE_1_1.35
*/
* @details name "autoScrollSpeed", type INT, default in style sheet
* @SINCE_1_1.35
*/