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 "Fixed bug in 3x3 NPatch shader and Color visual shader" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
visuals
/
text-visual-properties.h
diff --git
a/dali-toolkit/public-api/visuals/text-visual-properties.h
b/dali-toolkit/public-api/visuals/text-visual-properties.h
index
39a5eb3
..
0e2dd5d
100644
(file)
--- a/
dali-toolkit/public-api/visuals/text-visual-properties.h
+++ b/
dali-toolkit/public-api/visuals/text-visual-properties.h
@@
-19,7
+19,7
@@
*/
// INTERNAL INCLUDES
*/
// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/
visuals/visual-properti
es.h>
+#include <dali-toolkit/public-api/
toolkit-property-index-rang
es.h>
namespace Dali
{
namespace Dali
{
@@
-58,8
+58,8
@@
enum
/**
* @brief The requested font style to use,
/**
* @brief The requested font style to use,
- * @details name "fontStyle", type STRING
- * @SINCE_1_2.1
1
+ * @details name "fontStyle", type STRING
or MAP
+ * @SINCE_1_2.1
3
*/
FONT_STYLE,
*/
FONT_STYLE,
@@
-142,29
+142,29
@@
enum
/**
* @brief The default underline parameters.
/**
* @brief The default underline parameters.
- * @details name "underline", type STRING.
- * @SINCE_1_2.1
1
+ * @details name "underline", type STRING
or MAP
.
+ * @SINCE_1_2.1
3
*/
UNDERLINE,
/**
* @brief The default shadow parameters.
*/
UNDERLINE,
/**
* @brief The default shadow parameters.
- * @details name "shadow", type STRING.
- * @SINCE_1_2.1
1
+ * @details name "shadow", type STRING
or MAP
.
+ * @SINCE_1_2.1
3
*/
SHADOW,
/**
* @brief The default emboss parameters.
*/
SHADOW,
/**
* @brief The default emboss parameters.
- * @details name "emboss", type STRING.
- * @SINCE_1_2.1
1
+ * @details name "emboss", type STRING
or MAP
.
+ * @SINCE_1_2.1
3
*/
EMBOSS,
/**
* @brief The default outline parameters.
*/
EMBOSS,
/**
* @brief The default outline parameters.
- * @details name "outline", type STRING.
- * @SINCE_1_2.1
1
+ * @details name "outline", type STRING
or MAP
.
+ * @SINCE_1_2.1
3
*/
OUTLINE,
*/
OUTLINE,