X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fpush-button-impl.h;h=7a2347485a2f9939fd06d8c8275643fdfdccf937;hb=620ac79821b89142af1926f3577c7fa003f16ad3;hp=3eddddc421f4fde77c45baa283daf9ea1d8e5a5b;hpb=389593ad328d5a86972e32148a0ba45bad687b41;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.h b/dali-toolkit/internal/controls/buttons/push-button-impl.h index 3eddddc..7a23474 100644 --- a/dali-toolkit/internal/controls/buttons/push-button-impl.h +++ b/dali-toolkit/internal/controls/buttons/push-button-impl.h @@ -137,9 +137,14 @@ private: // From Control virtual void OnControlSizeSet( const Vector3& targetSize ); /** - * @copydoc Toolkit::Control::GetNaturalSize() + * @copydoc Toolkit::Control::GetNaturalSize */ - virtual Vector3 GetNaturalSize(); + Vector3 GetNaturalSize(); + + /** + * @copydoc Toolkit::Control::OnSetResizePolicy + */ + virtual void OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ); private: @@ -172,6 +177,20 @@ private: */ void FadeOutImage( Actor& image, float opacity = 1.f, Vector3 scale = Vector3( 1.f, 1.f, 1.f ) ); + /** + * @brief Custom configuration for size negotiation + */ + void ConfigureSizeNegotiation(); + + /** + * @brief Configure size negotiation for a given dimension + * + * @param[in] dimension The dimension to configure + * @param[in] images The list of images to configure + * @param[in] label The text label to configure + */ + void ConfigureSizeNegotiationDimension( Dimension::Type dimension, const ActorContainer& images, Actor& label ); + // slots /**