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 "Support animation of Visual transform properties" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
visuals
/
visual-properties.h
diff --git
a/dali-toolkit/public-api/visuals/visual-properties.h
b/dali-toolkit/public-api/visuals/visual-properties.h
index
be3aead
..
6f19efc
100644
(file)
--- a/
dali-toolkit/public-api/visuals/visual-properties.h
+++ b/
dali-toolkit/public-api/visuals/visual-properties.h
@@
-107,15
+107,16
@@
enum
/**
* @brief Mix color is a blend color for any visual.
/**
* @brief Mix color is a blend color for any visual.
- * @details Name "mixColor", type Property::VECTOR3 or Property::VECTOR4
.
+ * @details Name "mixColor", type Property::VECTOR3 or Property::VECTOR4
, animatable
* @SINCE_1_2.60
* @note Optional
* @SINCE_1_2.60
* @note Optional
+ * @note To animate an opacity, OPACITY property should be used.
*/
MIX_COLOR,
/**
* @brief Opacity is the alpha component of the mixColor, above.
*/
MIX_COLOR,
/**
* @brief Opacity is the alpha component of the mixColor, above.
- * @details Name "opacity", type Property::FLOAT
.
+ * @details Name "opacity", type Property::FLOAT
, animatable
* @SINCE_1_2.60
* @note Optional
*/
* @SINCE_1_2.60
* @note Optional
*/
@@
-162,7
+163,7
@@
enum Type
{
/**
* @brief Offset of the visual, which can be either relative (percentage [0.0f to 1.0f] of the parent) or absolute (in world units).
{
/**
* @brief Offset of the visual, which can be either relative (percentage [0.0f to 1.0f] of the parent) or absolute (in world units).
- * @details Name "offset", type Property::VECTOR2.
+ * @details Name "offset", type Property::VECTOR2
, animatable
.
* @SINCE_1_2.60
*
* @see OFFSET_POLICY
* @SINCE_1_2.60
*
* @see OFFSET_POLICY
@@
-171,7
+172,7
@@
enum Type
/**
* @brief Size of the visual, which can be either relative (percentage [0.0f to 1.0f] of the parent) or absolute (in world units).
/**
* @brief Size of the visual, which can be either relative (percentage [0.0f to 1.0f] of the parent) or absolute (in world units).
- * @details Name "size", type Property::VECTOR2.
+ * @details Name "size", type Property::VECTOR2
, animatable
.
* @see SIZE_POLICY
*/
SIZE,
* @see SIZE_POLICY
*/
SIZE,