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 "Added config section to stylesheet" 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
40c6c70
..
2721dc1
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
@@
-61,6
+61,9
@@
namespace Property
/**
* @brief The size of font in pixels.
/**
* @brief The size of font in pixels.
+ *
+ * Conversion from Point size to Pixel size :
+ * Pixel size = Point size * DPI / 72
* @details name "pixelSize", type float
*/
PIXEL_SIZE = OUTLINE + 1,
* @details name "pixelSize", type float
*/
PIXEL_SIZE = OUTLINE + 1,
@@
-83,6
+86,13
@@
namespace Property
* values FINISH_LOOP, IMMEDIATE, defualt FINISH_LOOP
*/
AUTO_SCROLL_STOP_MODE = OUTLINE + 4,
* values FINISH_LOOP, IMMEDIATE, defualt FINISH_LOOP
*/
AUTO_SCROLL_STOP_MODE = OUTLINE + 4,
+
+ /*
+ * @brief The line count of text.
+ * @details name "lineCount", type int
+ * @node this property is read-only.
+ */
+ LINE_COUNT = OUTLINE + 5
};
} // namespace Property
};
} // namespace Property