X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Flayouting%2Fvbox-layout-impl.cpp;h=22fba1678a07bf114476f02a25594d1b77ec2370;hb=f1132c09052bb20d89d98a26a8601fc69ab3e336;hp=7e33107aa0ec2c95b62dcbee2709b0cf1f40fa2e;hpb=a581878bf0de250859827868f64b866a7318264d;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 old mode 100755 new mode 100644 index 7e33107..22fba16 --- a/dali-toolkit/internal/layouting/vbox-layout-impl.cpp +++ b/dali-toolkit/internal/layouting/vbox-layout-impl.cpp @@ -233,7 +233,7 @@ void VboxLayout::OnLayout( bool changed, LayoutLength left, LayoutLength top, La auto width = right - left; // Space available for child - auto childSpace = width - (int)padding.start - (int)padding.end; + auto childSpace = width - padding.start - padding.end; auto count = GetChildCount(); for( unsigned int childIndex = 0; childIndex < count; childIndex++) @@ -248,10 +248,10 @@ void VboxLayout::OnLayout( bool changed, LayoutLength left, LayoutLength top, La auto childMargin = childLayout->GetMargin(); childTop += childMargin.top; - childLeft = ( childSpace - childWidth ) / 2 + (int)childMargin.start - (int)childMargin.end; + childLeft = ( childSpace - childWidth ) / 2 + childMargin.start - childMargin.end; childLayout->Layout( childLeft, childTop, childLeft + childWidth, childTop + childHeight ); - childTop += childHeight + (int)childMargin.bottom + mCellPadding.height; + childTop += childHeight + childMargin.bottom + mCellPadding.height; } } }