X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Fbuilder-set-property.cpp;h=a1ed104908a6d5dcbffa32111c088d59ab996fc0;hp=e0e98c8d4fdc0dcb72f03e57e57472bcff8363ff;hb=a505bf603895074e638b374097e6d5c649e2292e;hpb=af74001e7e61033e86323da5ad079ccbc310680a diff --git a/dali-toolkit/internal/builder/builder-set-property.cpp b/dali-toolkit/internal/builder/builder-set-property.cpp index e0e98c8..a1ed104 100644 --- a/dali-toolkit/internal/builder/builder-set-property.cpp +++ b/dali-toolkit/internal/builder/builder-set-property.cpp @@ -1,24 +1,32 @@ -// -// 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) 2015 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 +#include +#include +#include // INTERNAL INCLUDES #include #include #include + namespace Dali { @@ -72,7 +80,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,13 +210,10 @@ 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.... - { - value = *v; - done = true; - } + value = *v; + done = true; } break; } @@ -223,6 +242,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: @@ -296,18 +351,19 @@ bool SetPropertyFromNode( const TreeNode& node, Property::Type type, Property::V else if(node.Size()) { value = Property::Value(Property::ARRAY); + Property::Array* array = value.GetArray(); unsigned int i = 0; TreeNode::ConstIterator iter(node.CBegin()); for( ; i < node.Size(); ++i, ++iter) { - Property::Value v; - if( SetPropertyFromNode( (*iter).second, v, replacer ) ) + Property::Value childValue; + if( SetPropertyFromNode( (*iter).second, childValue, replacer ) ) { - value.AppendItem(v); + array->PushBack( childValue ); } } - if( value.GetSize() == static_cast(node.Size()) ) + if( array->Count() == node.Size() ) { done = true; } @@ -327,18 +383,19 @@ bool SetPropertyFromNode( const TreeNode& node, Property::Type type, Property::V else if(node.Size()) { value = Property::Value(Property::MAP); + Property::Map* map = value.GetMap(); unsigned int i = 0; TreeNode::ConstIterator iter(node.CBegin()); for( ; i < node.Size(); ++i, ++iter) { - Property::Value v; - if( SetPropertyFromNode( (*iter).second, v, replacer ) ) + Property::Value childValue; + if( SetPropertyFromNode( (*iter).second, childValue, replacer ) ) { - value.SetValue( (*iter).first, v ); + map->Insert( (*iter).first, childValue ); } } - if( value.GetSize() == static_cast(node.Size()) ) + if( map->Count() == node.Size() ) { done = true; } @@ -349,7 +406,6 @@ bool SetPropertyFromNode( const TreeNode& node, Property::Type type, Property::V } break; } - case Property::TYPE_COUNT: case Property::NONE: { break; @@ -434,13 +490,14 @@ bool SetPropertyFromNode( const TreeNode& node, Property::Value& value, else { value = Property::Value(Property::ARRAY); - Property::Value v; + Property::Array* array = value.GetArray(); for(TreeConstIter iter = node.CBegin(); iter != node.CEnd(); ++iter) { - if( SetPropertyFromNode( (*iter).second, v, replacer ) ) + Property::Value childValue; + if( SetPropertyFromNode( (*iter).second, childValue, replacer ) ) { - value.AppendItem(v); + array->PushBack( childValue ); done = true; } } @@ -458,12 +515,13 @@ bool SetPropertyFromNode( const TreeNode& node, Property::Value& value, if( ((*iter).first) == 0 ) { value = Property::Value(Property::ARRAY); - Property::Value v; + Property::Array* array = value.GetArray(); for(unsigned int i = 0; i < node.Size(); ++i, ++iter) { - if( SetPropertyFromNode( (*iter).second, v, replacer ) ) + Property::Value childValue; + if( SetPropertyFromNode( (*iter).second, childValue, replacer ) ) { - value.AppendItem(v); + array->PushBack( childValue ); done = true; } } @@ -471,12 +529,13 @@ bool SetPropertyFromNode( const TreeNode& node, Property::Value& value, else { value = Property::Value(Property::MAP); - Property::Value v; + Property::Map* map = value.GetMap(); for(unsigned int i = 0; i < node.Size(); ++i, ++iter) { - if( SetPropertyFromNode( (*iter).second, v, replacer ) ) + Property::Value childValue; + if( SetPropertyFromNode( (*iter).second, childValue, replacer ) ) { - value.SetValue((*iter).first, v); + map->Insert( (*iter).first, childValue ); done = true; } }