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
[dali_1.2.23] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
visuals
/
visual-properties-devel.h
diff --git
a/dali-toolkit/devel-api/visuals/visual-properties-devel.h
b/dali-toolkit/devel-api/visuals/visual-properties-devel.h
index
8f7248f
..
9c9a628
100644
(file)
--- a/
dali-toolkit/devel-api/visuals/visual-properties-devel.h
+++ b/
dali-toolkit/devel-api/visuals/visual-properties-devel.h
@@
-57,22
+57,30
@@
enum Type
/**
* @brief The transform used by the visual.
* @details Name "transform", type Property::Map.
/**
* @brief The transform used by the visual.
* @details Name "transform", type Property::Map.
-
+ *
* @note Optional.
* @see DevelVisual::Transform::Property
*/
* @note Optional.
* @see DevelVisual::Transform::Property
*/
- TRANSFORM = SHADER + 1,
// Dali::Toolkit::Visual::Property::SHADER + 1
+ TRANSFORM = SHADER + 1,
/**
* @brief Enables/disables premultiplied alpha.
* The premultiplied alpha is false by default unless this behaviour is modified
* by the derived Visual type.
/**
* @brief Enables/disables premultiplied alpha.
* The premultiplied alpha is false by default unless this behaviour is modified
* by the derived Visual type.
-
+ *
* @details Name "premultipliedAlpha", type Property::Boolean.
* @details Name "premultipliedAlpha", type Property::Boolean.
-
+ *
* @note Optional.
*/
* @note Optional.
*/
- PREMULTIPLIED_ALPHA = SHADER + 2, // Dali::Toolkit::Visual::Property::SHADER + 2
+ PREMULTIPLIED_ALPHA = SHADER + 2,
+
+ /**
+ * @brief Mix color is a blend color for any visual.
+ * @details Name "mixColor", type Property::VECTOR4
+ *
+ * @note Optional
+ */
+ MIX_COLOR = SHADER + 3,
};
} //namespace Property
};
} //namespace Property