X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Flayouting%2Fflex-node.cpp;h=f13549cf57b103db0bb79fed52dca21cb7004821;hp=189ab8a6e49affdbbde67c553461bea504aa6b3b;hb=37d747586c7385a57c2376b708795c46d607f14d;hpb=ac55712de2be195a393deebc6ea29d51560b9e75 diff --git a/dali-toolkit/devel-api/layouting/flex-node.cpp b/dali-toolkit/devel-api/layouting/flex-node.cpp index 189ab8a..f13549c 100644 --- a/dali-toolkit/devel-api/layouting/flex-node.cpp +++ b/dali-toolkit/devel-api/layouting/flex-node.cpp @@ -101,7 +101,7 @@ Node::~Node() DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Destructor() <<\n"); } -void Node::AddChild( Actor child, MeasureCallback measureFunction, int index ) +void Node::AddChild( Actor child, Extents margin, MeasureCallback measureFunction, int index ) { if( child ) { @@ -115,11 +115,17 @@ void Node::AddChild( Actor child, MeasureCallback measureFunction, int index ) childNode->mImpl->mActor = child; Vector2 minumumSize = child.GetMinimumSize(); Vector2 maximumSize = child.GetMaximumSize(); + YGNodeStyleSetMaxWidth( childNode->mImpl->mYogaNode, maximumSize.width ); YGNodeStyleSetMaxHeight( childNode->mImpl->mYogaNode, maximumSize.height ); YGNodeStyleSetMinWidth( childNode->mImpl->mYogaNode, minumumSize.width ); YGNodeStyleSetMinHeight( childNode->mImpl->mYogaNode, minumumSize.height ); + YGNodeStyleSetMargin( childNode->mImpl->mYogaNode, YGEdgeLeft, margin.start ); + YGNodeStyleSetMargin( childNode->mImpl->mYogaNode, YGEdgeTop, margin.top ); + YGNodeStyleSetMargin( childNode->mImpl->mYogaNode, YGEdgeRight, margin.end ); + YGNodeStyleSetMargin( childNode->mImpl->mYogaNode, YGEdgeBottom, margin.bottom ); + YGNodeSetMeasureFunc( childNode->mImpl->mYogaNode, &MeasureChild ); YGNodeInsertChild( mImpl->mYogaNode, childNode->mImpl->mYogaNode, index );