X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Fbuilder-actor.cpp;h=d04e7e8f8cb49f3734ee4e7515a149015f28c86d;hb=4bf366c7c657eacb5cf150fa52e34263ca16218f;hp=287663cedbef31056b5de2cd7eeeaae61ded1f81;hpb=2071317d301e9d5af326a3a2efcd2996263fbead;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/builder/builder-actor.cpp b/dali-toolkit/internal/builder/builder-actor.cpp index 287663c..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 = IsVector3(child, "parent-origin") ) + if( OptionalVector3 v = constant.IsVector3( IsChild(child, "parentOrigin") ) ) { actor.SetParentOrigin( *v ); } - else if( OptionalString origin = IsString(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 = IsVector3(child, "anchor-point") ) + if( OptionalVector3 v = constant.IsVector3( IsChild(child, "anchorPoint") ) ) { actor.SetAnchorPoint( *v ); } - else if( OptionalString anchor = IsString(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(); @@ -87,7 +87,7 @@ Actor SetupActor( const TreeNode& child, Actor& actor, const Replacement& consta { if( Property::INVALID_INDEX == index ) { - actor.RegisterProperty( key, value ); + actor.RegisterProperty( key, value, Property::READ_WRITE ); } else {