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
Blending enum clean-up
[platform/core/uifw/dali-toolkit.git]
/
docs
/
content
/
shared-javascript-and-cpp-documentation
/
control-renderers.md
diff --git
a/docs/content/shared-javascript-and-cpp-documentation/control-renderers.md
b/docs/content/shared-javascript-and-cpp-documentation/control-renderers.md
index
8f77b8d
..
b19b5dd
100644
(file)
--- a/
docs/content/shared-javascript-and-cpp-documentation/control-renderers.md
+++ b/
docs/content/shared-javascript-and-cpp-documentation/control-renderers.md
@@
-34,7
+34,7
@@
Renders a solid color to the control's quad.
| Property Name | Type | Required | Description |
|---------------|:-------:|:--------:|---------------------------|
| Property Name | Type | Required | Description |
|---------------|:-------:|:--------:|---------------------------|
-|
blendColor
| VECTOR4 | Yes | The solid color required. |
+|
mixColor
| VECTOR4 | Yes | The solid color required. |
### Usage
### Usage
@@
-44,7
+44,7
@@
Dali::Toolkit::Control control = Dali::Toolkit::Control::New();
Dali::Property::Map map;
map[ "rendererType" ] = "color";
Dali::Property::Map map;
map[ "rendererType" ] = "color";
-map[ "
blend
Color" ] = Color::RED;
+map[ "
mix
Color" ] = Color::RED;
control.SetProperty( Dali::Toolkit::Control::Property::BACKGROUND, map );
~~~
control.SetProperty( Dali::Toolkit::Control::Property::BACKGROUND, map );
~~~
@@
-56,7
+56,7
@@
var control = new dali.Control( "Control" );
control.background =
{
rendererType : "color",
control.background =
{
rendererType : "color",
-
blend
Color : dali.COLOR_RED
+
mix
Color : dali.COLOR_RED
};
~~~
___________________________________________________________________________________________________
};
~~~
___________________________________________________________________________________________________