X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Fbuilder-actor.cpp;h=d04e7e8f8cb49f3734ee4e7515a149015f28c86d;hp=fbe8c335e272e60786cb7c3cce55944efd799a9a;hb=f3da11c2818c6d17706fbb2417f21b602b3190f5;hpb=d7638de1a66bed4868e8a9fb2f4d3c03f4ce27f8 diff --git a/dali-toolkit/internal/builder/builder-actor.cpp b/dali-toolkit/internal/builder/builder-actor.cpp index fbe8c33..d04e7e8 100644 --- a/dali-toolkit/internal/builder/builder-actor.cpp +++ b/dali-toolkit/internal/builder/builder-actor.cpp @@ -47,32 +47,32 @@ Actor SetupActor( const TreeNode& child, Actor& actor, const Replacement& consta // we allow enums strings for parent-origin and anchor-point but as with the current json // strings always succeed if they exist then check its not vector. If they are Vec3s then // this has already been set as a generic property. - if( !IsVector3( child, "parent-origin") ) + if( !IsVector3( child, "parentOrigin") ) { - if( OptionalVector3 v = constant.IsVector3( IsChild(child, "parent-origin") ) ) + if( OptionalVector3 v = constant.IsVector3( IsChild(child, "parentOrigin") ) ) { actor.SetParentOrigin( *v ); } - else if( OptionalString origin = constant.IsString( IsChild(child, "parent-origin") ) ) + else if( OptionalString origin = constant.IsString( IsChild(child, "parentOrigin") ) ) { actor.SetParentOrigin( GetAnchorConstant(*origin) ); } } - if( !IsVector3(child, "anchor-point") ) + if( !IsVector3(child, "anchorPoint") ) { - if( OptionalVector3 v = constant.IsVector3( IsChild(child, "anchor-point") ) ) + if( OptionalVector3 v = constant.IsVector3( IsChild(child, "anchorPoint") ) ) { actor.SetAnchorPoint( *v ); } - else if( OptionalString anchor = constant.IsString( IsChild(child, "anchor-point") ) ) + else if( OptionalString anchor = constant.IsString( IsChild(child, "anchorPoint") ) ) { actor.SetAnchorPoint( GetAnchorConstant(*anchor) ); } } // Add custom properties - if( OptionalChild customPropertiesChild = IsChild(child, "custom-properties") ) + if( OptionalChild customPropertiesChild = IsChild(child, "customProperties") ) { const TreeNode& customPropertiesNode = *customPropertiesChild; const TreeConstIter endIter = customPropertiesNode.CEnd();