X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Flayouting%2Fvbox-layout-impl.cpp;h=22fba1678a07bf114476f02a25594d1b77ec2370;hb=46a27bd33d7dc6ef7844b63399dbdfcb2ebb55d7;hp=3097a21371c168a85aa21af5dc1b6a902b73f443;hpb=e8ea0328f92e38164592f09b9c978258622c0939;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/layouting/vbox-layout-impl.cpp b/dali-toolkit/internal/layouting/vbox-layout-impl.cpp index 3097a21..22fba16 100644 --- a/dali-toolkit/internal/layouting/vbox-layout-impl.cpp +++ b/dali-toolkit/internal/layouting/vbox-layout-impl.cpp @@ -29,7 +29,7 @@ namespace { #if defined(DEBUG_ENABLED) -static Debug::Filter* gLogFilter = Debug::Filter::New( Debug::Concise, false, "LOG_LAYOUT" ); +static Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_LAYOUT" ); #endif } @@ -133,7 +133,8 @@ void VboxLayout::OnMeasure( MeasureSpec widthMeasureSpec, MeasureSpec heightMeas MeasureChildWithMargins( childLayout, widthMeasureSpec, 0, heightMeasureSpec, 0 ); auto childHeight = childLayout->GetMeasuredHeight(); - auto childMargin = childOwner.GetProperty( Toolkit::LayoutGroup::ChildProperty::MARGIN_SPECIFICATION ); + auto childMargin = childLayout->GetMargin(); + auto length = childHeight + LayoutLength::IntType(childMargin.top + childMargin.bottom ); auto cellPadding = iGetMeasuredHeight(); auto childOwner = childLayout->GetOwner(); - auto childMargin = childOwner.GetProperty( Toolkit::LayoutGroup::ChildProperty::MARGIN_SPECIFICATION ); + auto childMargin = childLayout->GetMargin(); childTop += childMargin.top; childLeft = ( childSpace - childWidth ) / 2 + childMargin.start - childMargin.end;