X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Fbuilder-set-property.cpp;h=184d25313b9ccd35a4bc8a7453ffec457aa3c5a8;hb=7aa9e3d716396348b89c913b306bbc1ce201db69;hp=e0e98c8d4fdc0dcb72f03e57e57472bcff8363ff;hpb=af74001e7e61033e86323da5ad079ccbc310680a;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/builder/builder-set-property.cpp b/dali-toolkit/internal/builder/builder-set-property.cpp
index e0e98c8..184d253 100644
--- a/dali-toolkit/internal/builder/builder-set-property.cpp
+++ b/dali-toolkit/internal/builder/builder-set-property.cpp
@@ -1,24 +1,30 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <sstream>
+#include <dali/public-api/adaptor-framework/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
 {
 
@@ -72,7 +78,21 @@ bool SetPropertyFromNode( const TreeNode& node, Property::Type type, Property::V
 namespace
 {
 
-
+/**
+ * Converts a HTML style 'color' hex string ("#FF0000" for bright red) to a Vector4.
+ * The Vector4 alpha component will be set to 1.0f
+ * @param hexString The HTML style hex string
+ * @return a Vector4 containing the new color value
+ */
+Vector4 HexStringToVector4( const char* s )
+{
+  unsigned int value(0u);
+  std::istringstream( s ) >> std::hex >> value;
+  return Vector4( ((value >> 16 ) & 0xff ) / 255.0f,
+                  ((value >> 8 ) & 0xff ) / 255.0f,
+                  (value & 0xff ) / 255.0f,
+                  1.0f );
+}
 
 } // anon namespace
 
@@ -188,7 +208,7 @@ bool SetPropertyFromNode( const TreeNode& node, Property::Type type, Property::V
     }
     case Property::UNSIGNED_INTEGER:
     {
-      if( OptionalInteger v = replacer.IsInteger(node) )
+      if( OptionalUnsignedInt v = replacer.IsUnsignedInteger( node) )
       {
         if( *v >= 0 ) // with a loss of resolution....
         {
@@ -223,6 +243,42 @@ bool SetPropertyFromNode( const TreeNode& node, Property::Type type, Property::V
         value = *v;
         done = true;
       }
+      else if( OptionalString s = replacer.IsString(node) )
+      {
+        if( (*s)[0] == '#' && 7 == (*s).size() )
+        {
+          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() )
+      {
+        // check for "r", "g" and "b" child color component nodes
+        OptionalInteger r = replacer.IsInteger( IsChild(node, "r") );
+        OptionalInteger g = replacer.IsInteger( IsChild(node, "g") );
+        OptionalInteger b = replacer.IsInteger( IsChild(node, "b") );
+        if( r && g && b )
+        {
+          float red( (*r) * (1.0f/255.0f) );
+          float green( (*g) * (1.0f/255.0f) );
+          float blue( (*b) * (1.0f/255.0f) );
+          // check for optional "a" (alpha) node, default to fully opaque if it is not found.
+          float alpha( 1.0f );
+          OptionalInteger a = replacer.IsInteger( IsChild(node, "a") );
+          if( a )
+          {
+            alpha = (*a) * (1.0f/255.0f);
+          }
+          value = Vector4( red, green, blue, alpha );
+          done = true;
+        }
+      }
       break;
     }
     case Property::MATRIX3: