X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fbuilder%2Fbuilder-set-property.cpp;h=63738c820d98739ce07f1b4fe74c2dc9c614a360;hb=e9d230c154e17c97dff21edff31db7efd9c12b38;hp=71ae7a0b61f9f3586b70ae5cd0d449cae0ab80f9;hpb=b75c60347086e889152194b1c64ee54a739835ae;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/base/dali-toolkit/internal/builder/builder-set-property.cpp b/base/dali-toolkit/internal/builder/builder-set-property.cpp
index 71ae7a0..63738c8 100644
--- a/base/dali-toolkit/internal/builder/builder-set-property.cpp
+++ b/base/dali-toolkit/internal/builder/builder-set-property.cpp
@@ -18,11 +18,14 @@
 // EXTERNAL INCLUDES
 #include <sstream>
 
+#include <dali/public-api/adaptor-framework/common/color-controller.h>
+
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/builder/builder-impl.h>
 #include <dali-toolkit/internal/builder/builder-get-is.inl.h>
 #include <dali-toolkit/internal/builder/replacement.h>
 
+
 namespace Dali
 {
 
@@ -248,6 +251,12 @@ bool SetPropertyFromNode( const TreeNode& node, Property::Type type, Property::V
           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() )
       {