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
Cleaning up property public API and usage of typedefs
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
internal
/
builder
/
builder-set-property.cpp
diff --git
a/base/dali-toolkit/internal/builder/builder-set-property.cpp
b/base/dali-toolkit/internal/builder/builder-set-property.cpp
index
ac3c564
..
00d6ec6
100644
(file)
--- a/
base/dali-toolkit/internal/builder/builder-set-property.cpp
+++ b/
base/dali-toolkit/internal/builder/builder-set-property.cpp
@@
-23,6
+23,7
@@
#include <dali-toolkit/internal/builder/builder-get-is.inl.h>
#include <dali-toolkit/internal/builder/replacement.h>
#include <dali-toolkit/internal/builder/builder-get-is.inl.h>
#include <dali-toolkit/internal/builder/replacement.h>
+
namespace Dali
{
namespace Dali
{
@@
-206,7
+207,7
@@
bool SetPropertyFromNode( const TreeNode& node, Property::Type type, Property::V
}
case Property::UNSIGNED_INTEGER:
{
}
case Property::UNSIGNED_INTEGER:
{
- if( Optional
Integer v = replacer.IsInteger(
node) )
+ if( Optional
UnsignedInt v = replacer.IsUnsignedInteger(
node) )
{
if( *v >= 0 ) // with a loss of resolution....
{
{
if( *v >= 0 ) // with a loss of resolution....
{
@@
-248,6
+249,12
@@
bool SetPropertyFromNode( const TreeNode& node, Property::Type type, Property::V
value = HexStringToVector4( &(*s)[1] );
done = true;
}
value = HexStringToVector4( &(*s)[1] );
done = true;
}
+ else if( Dali::ColorController::Get() )
+ {
+ Vector4 color;
+ done = Dali::ColorController::Get().RetrieveColor( *s, color );
+ value = color;
+ }
}
else if( TreeNode::OBJECT == node.GetType() )
{
}
else if( TreeNode::OBJECT == node.GetType() )
{