X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fpush-button-impl.cpp;h=b1689160b6464fe244c3ffab246dc7f25029b1fd;hb=6d57c78dba8e6322b50d7d39ee3c553d74cfb459;hp=7a8ec5d33c48be157e341b36b1fd9d9426d81007;hpb=06e563f8a982e25a0efe2d91c794657dc8e4bc4a;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp index 7a8ec5d..b168916 100644 --- a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp @@ -273,12 +273,17 @@ Property::Value PushButton::GetProperty( BaseObject* object, Property::Index pro return value; } -void PushButton::OnLabelSet() +void PushButton::OnLabelSet( bool noPadding ) { Actor& label = GetLabelActor(); if( label ) { + if( noPadding ) + { + mLabelPadding = Padding( 0.0f, 0.0f, 0.0f, 0.0f ); + } + Toolkit::TextLabel textLabel = Toolkit::TextLabel::DownCast( label ); if( textLabel ) { @@ -557,6 +562,7 @@ void PushButton::ConfigureSizeNegotiation() RelayoutRequest(); } + void PushButton::ConfigureSizeNegotiationDimension( Dimension::Type dimension, const std::vector< Actor >& images, Actor& label ) { ResizePolicy::Type imageResizePolicy = ResizePolicy::FILL_TO_PARENT;