Add color lookup into Builder & apply changeable color on TextInput

[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 71ae7a0..63738c8 100644 (file)
--- 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() )
       {