X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.cpp;h=d65c16b0c734c2ba622d6f702fd4b398fa56e432;hp=16b4e6738493aaa88c80ffa9845f6755444aedc8;hb=935e800159c04fa5d389628add6183eb68f778ee;hpb=b46395d404c2b437c4679975e0ed2c073949ba61 diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 16b4e67..d65c16b 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -420,13 +420,13 @@ Vector3 Control::GetNaturalSize() return mImpl->mNaturalSize; } -float Control::CalculateChildSize( const Dali::Actor& child, Dimension dimension ) +float Control::CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension ) { // Could be overridden in derived classes. return CalculateChildSizeBase( child, dimension ); } -bool Control::RelayoutDependentOnChildren( Dimension dimension ) +bool Control::RelayoutDependentOnChildren( Dimension::Type dimension ) { return RelayoutDependentOnChildrenBase( dimension ); } @@ -900,11 +900,11 @@ void Control::OnControlSizeSet( const Vector3& size ) { } -void Control::OnCalculateRelayoutSize( Dimension dimension ) +void Control::OnCalculateRelayoutSize( Dimension::Type dimension ) { } -void Control::OnLayoutNegotiated( float size, Dimension dimension ) +void Control::OnLayoutNegotiated( float size, Dimension::Type dimension ) { } @@ -916,7 +916,7 @@ void Control::OnRelayout( const Vector2& size, RelayoutContainer& container ) } } -void Control::OnSetResizePolicy( ResizePolicy policy, Dimension dimension ) +void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ) { }