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=fbe8c335e272e60786cb7c3cce55944efd799a9a;hp=d8271e401c4f5c1d0b03faea9fb932fd281d7789;hb=ae34cf6aef4b3b807bd1e099baa48230b6b32156;hpb=2ddfbb9e23a7c3fc30e604236c41e0ef6d2ed6a2 diff --git a/dali-toolkit/internal/builder/builder-actor.cpp b/dali-toolkit/internal/builder/builder-actor.cpp index d8271e4..fbe8c33 100644 --- a/dali-toolkit/internal/builder/builder-actor.cpp +++ b/dali-toolkit/internal/builder/builder-actor.cpp @@ -18,7 +18,7 @@ // EXTERNAL INCLUDES #include #include -#include +#include // INTERNAL INCLUDES #include @@ -49,11 +49,11 @@ Actor SetupActor( const TreeNode& child, Actor& actor, const Replacement& consta // this has already been set as a generic property. if( !IsVector3( child, "parent-origin") ) { - if( OptionalVector3 v = IsVector3(child, "parent-origin") ) + if( OptionalVector3 v = constant.IsVector3( IsChild(child, "parent-origin") ) ) { actor.SetParentOrigin( *v ); } - else if( OptionalString origin = IsString(child, "parent-origin") ) + else if( OptionalString origin = constant.IsString( IsChild(child, "parent-origin") ) ) { actor.SetParentOrigin( GetAnchorConstant(*origin) ); } @@ -61,11 +61,11 @@ Actor SetupActor( const TreeNode& child, Actor& actor, const Replacement& consta if( !IsVector3(child, "anchor-point") ) { - if( OptionalVector3 v = IsVector3(child, "anchor-point") ) + if( OptionalVector3 v = constant.IsVector3( IsChild(child, "anchor-point") ) ) { actor.SetAnchorPoint( *v ); } - else if( OptionalString anchor = IsString(child, "anchor-point") ) + else if( OptionalString anchor = constant.IsString( IsChild(child, "anchor-point") ) ) { actor.SetAnchorPoint( GetAnchorConstant(*anchor) ); } @@ -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 {