X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fpush-button-impl.cpp;h=4331c873165112723bcef3c4566601606d6ccc81;hp=bd26b232d346ecdbc7f412665d3fdc4b7b6c2744;hb=f3da11c2818c6d17706fbb2417f21b602b3190f5;hpb=3b1fb566901d21b8303d9be3308e3920f5182e6d diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp index bd26b23..4331c87 100644 --- a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp @@ -21,9 +21,12 @@ // EXTERNAL INCLUDES #include #include +#include +#include +#include // INTERNAL INCLUDES -#include +#include namespace Dali { @@ -37,20 +40,41 @@ namespace Internal namespace { -const float TEXT_PADDING = 12.0f; - -const float LABEL_DEPTH( 0.75f ); -const float FOREGROUND_DEPTH( 0.5f ); -const float BACKGROUND_DEPTH( 0.25f ); - -const float ANIMATION_TIME( 0.2f ); +const float ANIMATION_TIME( 0.2f ); +const Padding DEFAULT_LABEL_PADDING( 12.0f, 12.0f, 12.0f, 12.0f ); +const Padding DEFAULT_ICON_PADDING( 12.0f, 12.0f, 12.0f, 12.0f ); BaseHandle Create() { return Toolkit::PushButton::New(); } -TypeRegistration typeRegistration( typeid(Toolkit::PushButton), typeid(Toolkit::Button), Create ); +// Properties + +DALI_TYPE_REGISTRATION_BEGIN( Toolkit::PushButton, Toolkit::Button, Create ) + +DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "unselectedIcon", STRING, UNSELECTED_ICON ) +DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "selectedIcon", STRING, SELECTED_ICON ) +DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "iconAlignment", STRING, ICON_ALIGNMENT ) +DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "labelPadding", STRING, LABEL_PADDING ) +DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "iconPadding", STRING, ICON_PADDING ) + +DALI_TYPE_REGISTRATION_END() + +/* + * Table to define Text-to-enum conversions for IconAlignment. + */ +const Dali::Scripting::StringEnum IconAlignmentTable[] = { + { "LEFT", Toolkit::Internal::PushButton::LEFT }, + { "RIGHT", Toolkit::Internal::PushButton::RIGHT }, + { "TOP", Toolkit::Internal::PushButton::TOP }, + { "BOTTOM", Toolkit::Internal::PushButton::BOTTOM }, +}; const unsigned int IconAlignmentTableCount = sizeof( IconAlignmentTable ) / sizeof( IconAlignmentTable[0] ); + +const char* const UNSELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "button-up.9.png"; +const char* const SELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "button-down.9.png"; +const char* const DISABLED_UNSELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "button-disabled.9.png"; +const char* const DISABLED_SELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "button-down-disabled.9.png"; } // unnamed namespace @@ -58,24 +82,18 @@ namespace { /** - * Find the first image actor in the actor hierarchy + * Get size of Actor if larger than given size + * @param[in] root the actor to get the size of + * @param[out] size the greater of the given size or the size of the Actor */ -ImageActor FindImageActor( Actor root ) +void SizeOfActorIfLarger( Actor root, Vector3& size ) { - ImageActor imageActor = ImageActor::DownCast( root ); - if( !imageActor && root ) + if ( root ) { - for( unsigned int i = 0, numChildren = root.GetChildCount(); i < numChildren; ++i ) - { - ImageActor childImageActor = FindImageActor( root.GetChildAt( i ) ); - if( childImageActor ) - { - return childImageActor; - } - } + // RelayoutSize retreived for Actor to use any padding set to it. + size.width = std::max( root.GetRelayoutSize( Dimension::WIDTH ), size.width ); + size.height = std::max( root.GetRelayoutSize( Dimension::HEIGHT ), size.height ); } - - return imageActor; } } // unnamed namespace @@ -97,8 +115,10 @@ Dali::Toolkit::PushButton PushButton::New() PushButton::PushButton() : Button(), - mSize(), - mPaintState( UnselectedState ) + mLabelPadding( DEFAULT_LABEL_PADDING ), + mIconPadding( DEFAULT_ICON_PADDING ), + mIconAlignment( RIGHT ), + mSize() { SetAnimationTime( ANIMATION_TIME ); } @@ -107,1173 +127,477 @@ PushButton::~PushButton() { } -void PushButton::SetButtonImage( Actor image ) +void PushButton::OnButtonInitialize() { - Actor& buttonImage = GetButtonImage(); - Actor& fadeOutButtonImage = GetFadeOutButtonImage(); - - switch( mPaintState ) - { - case UnselectedState: - { - if( buttonImage && buttonImage.GetParent() ) - { - StopFadeOutAnimation(); - FadeOutImage( Foreground, buttonImage ); - - buttonImage = image; - - FadeInImage( buttonImage ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); - } - else - { - buttonImage = image; - Self().Add( buttonImage ); - } - break; - } - case UnselectedSelectedTransition: // FALLTHROUGH - case UnselectedDisabledTransition: - { - float opacity = 1.f; - if( fadeOutButtonImage ) - { - opacity = fadeOutButtonImage.GetCurrentOpacity(); - } - StopFadeOutAnimation(); - - // Replaces the button image. - buttonImage = image; - - Self().Add( buttonImage ); - FadeOutImage( Foreground, buttonImage, opacity ); - - StartFadeOutAnimation(); - break; - } - case SelectedUnselectedTransition: // FALLTHROUGH - case DisabledUnselectedTransition: - { - StopFadeInAnimation(); - Self().Remove( buttonImage ); - - buttonImage = image; + // Push button requires the Leave event. + Actor self = Self(); + self.SetLeaveRequired( true ); - FadeInImage( buttonImage ); - StartFadeInAnimation(); - break; - } - default: - buttonImage = image; - break; - } + // Set resize policy to natural size so that buttons will resize to background images + self.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); - buttonImage.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - buttonImage.SetParentOrigin( ParentOrigin::TOP_LEFT ); - buttonImage.SetPosition( 0.f, 0.f, FOREGROUND_DEPTH ); - buttonImage.SetSizeMode( SIZE_EQUAL_TO_PARENT ); + SetUnselectedImage( UNSELECTED_BUTTON_IMAGE_DIR ); + SetSelectedImage( SELECTED_BUTTON_IMAGE_DIR ); + SetDisabledImage( DISABLED_UNSELECTED_BUTTON_IMAGE_DIR ); + SetDisabledSelectedImage( DISABLED_SELECTED_BUTTON_IMAGE_DIR ); } -void PushButton::SetSelectedImage( Actor image ) +void PushButton::SetIcon( DecorationState state, const std::string iconFilename ) { - Actor& selectedImage = GetSelectedImage(); - Actor& fadeOutButtonImage = GetFadeOutButtonImage(); - - switch( mPaintState ) - { - case SelectedState: - { - if( selectedImage && selectedImage.GetParent() ) - { - StopFadeOutAnimation(); - FadeOutImage( Foreground, selectedImage ); - - selectedImage = image; - - FadeInImage( selectedImage ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); - } - else - { - selectedImage = image; - Self().Add( selectedImage ); - } - break; - } - case SelectedUnselectedTransition: // FALLTHROUGH - case SelectedDisabledTransition: - { - float opacity = 1.f; - if( fadeOutButtonImage ) - { - opacity = fadeOutButtonImage.GetCurrentOpacity(); - } - StopFadeOutAnimation(); - - // Replaces the button image. - selectedImage = image; - - Self().Add( selectedImage ); - FadeOutImage( Foreground, selectedImage, opacity ); - - StartFadeOutAnimation(); - break; - } - case UnselectedSelectedTransition: // FALLTHROUGH - case DisabledSelectedTransition: - { - StopFadeInAnimation(); - Self().Remove( selectedImage ); - - selectedImage = image; - - FadeInImage( selectedImage ); - StartFadeInAnimation(); - break; - } - default: - selectedImage = image; - break; - } - - selectedImage.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - selectedImage.SetParentOrigin( ParentOrigin::TOP_LEFT ); - selectedImage.SetPosition( 0.f, 0.f, FOREGROUND_DEPTH ); - selectedImage.SetSizeMode( SIZE_EQUAL_TO_PARENT ); + mIconName[ state ] = iconFilename; + SetDecoration( state, ImageActor::New( Dali::ResourceImage::New( iconFilename ) ) ); + ConfigureSizeNegotiation(); } -void PushButton::SetBackgroundImage( Actor image ) +std::string& PushButton::GetIcon( DecorationState state ) { - Actor& backgroundImage = GetBackgroundImage(); - Actor& fadeOutBackgroundImage = GetFadeOutBackgroundImage(); - - switch( mPaintState ) - { - case UnselectedState: // FALLTHROUGH - case SelectedState: - case UnselectedSelectedTransition: - case SelectedUnselectedTransition: - { - if( backgroundImage && backgroundImage.GetParent() ) - { - StopFadeOutAnimation(); - FadeOutImage( Background, backgroundImage ); - - backgroundImage = image; - - FadeInImage( backgroundImage ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); - } - else - { - backgroundImage = image; - Self().Add( backgroundImage ); - } - break; - } - case UnselectedDisabledTransition: // FALLTHROUGH - case SelectedDisabledTransition: - { - float opacity = 1.f; - if( fadeOutBackgroundImage ) - { - opacity = fadeOutBackgroundImage.GetCurrentOpacity(); - } - StopFadeOutAnimation(); - - // Replaces the button image. - backgroundImage = image; - - Self().Add( backgroundImage ); - FadeOutImage( Background, backgroundImage, opacity ); - - StartFadeOutAnimation(); - break; - } - case DisabledUnselectedTransition: // FALLTHROUGH - case DisabledSelectedTransition: - { - StopFadeInAnimation(); - Self().Remove( backgroundImage ); - - backgroundImage = image; - - FadeInImage( backgroundImage ); - StartFadeInAnimation(); - break; - } - default: - backgroundImage = image; - break; - } - - backgroundImage.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - backgroundImage.SetParentOrigin( ParentOrigin::TOP_LEFT ); - backgroundImage.SetPosition( 0.f, 0.f, BACKGROUND_DEPTH ); - backgroundImage.SetSizeMode( SIZE_EQUAL_TO_PARENT ); + return mIconName[ state ]; } -void PushButton::SetDisabledImage( Actor image ) +void PushButton::SetIconAlignment( const PushButton::IconAlignment iconAlignment ) { - Actor& disabledImage = GetDisabledImage(); - Actor& fadeOutButtonImage = GetFadeOutButtonImage(); - - switch( mPaintState ) - { - case DisabledUnselectedState: // FALLTHROUGH - case DisabledSelectedState: - { - if( disabledImage && disabledImage.GetParent() ) - { - StopFadeOutAnimation(); - FadeOutImage( Foreground, disabledImage ); - - disabledImage = image; - - FadeInImage( disabledImage ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); - } - else - { - disabledImage = image; - Self().Add( disabledImage ); - } - break; - } - case UnselectedDisabledTransition: // FALLTHROUGH - case SelectedDisabledTransition: - { - StopFadeInAnimation(); - Self().Remove( disabledImage ); - - disabledImage = image; - - FadeInImage( disabledImage ); - StartFadeInAnimation(); - break; - } - case DisabledUnselectedTransition: // FALLTHROUGH - case DisabledSelectedTransition: - { - float opacity = 1.f; - if( fadeOutButtonImage ) - { - opacity = fadeOutButtonImage.GetCurrentOpacity(); - } - StopFadeOutAnimation(); - - // Replaces the button image. - disabledImage = image; - - Self().Add( disabledImage ); - FadeOutImage( Foreground, disabledImage, opacity ); - - StartFadeOutAnimation(); - break; - } - default: - disabledImage = image; - break; - } - - disabledImage.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - disabledImage.SetParentOrigin( ParentOrigin::TOP_LEFT ); - disabledImage.SetPosition( 0.f, 0.f, FOREGROUND_DEPTH ); - disabledImage.SetSizeMode( SIZE_EQUAL_TO_PARENT ); + mIconAlignment = iconAlignment; + ConfigureSizeNegotiation(); } -void PushButton::SetDisabledBackgroundImage( Actor image ) +const PushButton::IconAlignment PushButton::GetIconAlignment() const { - Actor& disabledBackgroundImage = GetDisabledBackgroundImage(); - Actor& fadeOutBackgroundImage = GetFadeOutBackgroundImage(); - - switch( mPaintState ) - { - case DisabledUnselectedState: // FALLTHROUGH - case DisabledSelectedState: - { - if( disabledBackgroundImage && disabledBackgroundImage.GetParent() ) - { - StopFadeOutAnimation(); - FadeOutImage( Background, disabledBackgroundImage ); - - disabledBackgroundImage = image; - - FadeInImage( disabledBackgroundImage ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); - } - else - { - disabledBackgroundImage = image; - Self().Add( disabledBackgroundImage ); - } - break; - } - case UnselectedDisabledTransition: // FALLTHROUGH - case SelectedDisabledTransition: - { - StopFadeInAnimation(); - Self().Remove( disabledBackgroundImage ); - - disabledBackgroundImage = image; - - FadeInImage( disabledBackgroundImage ); - StartFadeInAnimation(); - break; - } - case DisabledUnselectedTransition: // FALLTHROUGH - case DisabledSelectedTransition: - { - float opacity = 1.f; - if( fadeOutBackgroundImage ) - { - opacity = fadeOutBackgroundImage.GetCurrentOpacity(); - } - StopFadeOutAnimation(); - - // Replaces the button image. - disabledBackgroundImage = image; - - Self().Add( disabledBackgroundImage ); - FadeOutImage( Background, disabledBackgroundImage, opacity ); - - StartFadeOutAnimation(); - break; - } - default: - disabledBackgroundImage = image; - break; - } - - disabledBackgroundImage.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - disabledBackgroundImage.SetParentOrigin( ParentOrigin::TOP_LEFT ); - disabledBackgroundImage.SetPosition( 0.f, 0.f, BACKGROUND_DEPTH ); - disabledBackgroundImage.SetSizeMode( SIZE_EQUAL_TO_PARENT ); + return mIconAlignment; } -void PushButton::OnButtonInitialize() +void PushButton::SetLabelPadding( const Vector4& padding ) { - // Push button requires the Leave event. - Actor root = Self(); - root.SetLeaveRequired( true ); + mLabelPadding = Padding( padding.x, padding.y, padding.z, padding.w ); + ConfigureSizeNegotiation(); } -void PushButton::OnLabelSet() +Vector4 PushButton::GetLabelPadding() { - Actor& label = GetLabel(); + return Vector4( mLabelPadding.left, mLabelPadding.right, mLabelPadding.top, mLabelPadding.bottom ); +} - if( label ) - { - label.SetAnchorPoint( AnchorPoint::CENTER ); - label.SetParentOrigin( ParentOrigin::CENTER ); - label.SetPosition( 0.f, 0.f, LABEL_DEPTH ); - label.SetSize( mSize ); +void PushButton::SetIconPadding( const Vector4& padding ) +{ + mIconPadding = Padding( padding.x, padding.y, padding.z, padding.w ); + ConfigureSizeNegotiation(); +} - Self().Add( label ); - } +Vector4 PushButton::GetIconPadding() +{ + return Vector4( mIconPadding.left, mIconPadding.right, mIconPadding.top, mIconPadding.bottom ); } -void PushButton::OnSelected( bool selected ) +void PushButton::SetProperty( BaseObject* object, Property::Index propertyIndex, const Property::Value& value ) { - Actor& selectedImage = GetSelectedImage(); - Actor& buttonImage = GetButtonImage(); - Actor& fadeOutButtonImage = GetFadeOutButtonImage(); + Toolkit::PushButton pushButton = Toolkit::PushButton::DownCast( Dali::BaseHandle( object ) ); - switch( mPaintState ) + if ( pushButton ) { - case UnselectedState: - { - StopFadeOutAnimation(); - FadeOutImage( Foreground, buttonImage ); - FadeInImage( selectedImage ); - StartFadeOutAnimation(); - StartFadeInAnimation(); + PushButton& pushButtonImpl( GetImplementation( pushButton ) ); - if( buttonImage || selectedImage ) - { - mPaintState = UnselectedSelectedTransition; - } - else - { - mPaintState = SelectedState; - } - break; - } - case SelectedState: + switch ( propertyIndex ) { - StopFadeOutAnimation(); - FadeOutImage( Foreground, selectedImage ); - FadeInImage( buttonImage ); - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( buttonImage || selectedImage ) + case Toolkit::PushButton::Property::UNSELECTED_ICON: { - mPaintState = SelectedUnselectedTransition; + pushButtonImpl.SetIcon( UNSELECTED_DECORATION, value.Get< std::string >() ); + break; } - else + case Toolkit::PushButton::Property::SELECTED_ICON: { - mPaintState = UnselectedState; + pushButtonImpl.SetIcon( SELECTED_DECORATION, value.Get< std::string >() ); + break; } - break; - } - case UnselectedSelectedTransition: - { - float opacity = 1.f; - if( fadeOutButtonImage ) + case Toolkit::PushButton::Property::ICON_ALIGNMENT: { - opacity = fadeOutButtonImage.GetCurrentOpacity(); + IconAlignment iconAlignment; + if( Scripting::GetEnumeration< IconAlignment >( value.Get< std::string >().c_str(), IconAlignmentTable, IconAlignmentTableCount, iconAlignment ) ) + { + pushButtonImpl.SetIconAlignment( iconAlignment ); + } + break; } - StopFadeOutAnimation( false ); - StopFadeInAnimation(); - - FadeOutImage( Foreground, selectedImage, 1.f - opacity ); - FadeInImage( buttonImage, opacity ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( buttonImage || selectedImage ) + case Toolkit::PushButton::Property::LABEL_PADDING: { - mPaintState = SelectedUnselectedTransition; + pushButtonImpl.SetLabelPadding( value.Get< Vector4 >() ); + break; } - else + case Toolkit::PushButton::Property::ICON_PADDING: { - mPaintState = UnselectedState; + pushButtonImpl.SetIconPadding( value.Get< Vector4 >() ); + break; } - break; - } - case SelectedUnselectedTransition: - { - float opacity = 0.f; - if( fadeOutButtonImage ) - { - opacity = 1.f - fadeOutButtonImage.GetCurrentOpacity(); - } - StopFadeOutAnimation( false ); - StopFadeInAnimation(); - - FadeOutImage( Foreground, buttonImage, 1.f - opacity ); - FadeInImage( selectedImage, opacity ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( buttonImage || selectedImage ) - { - mPaintState = UnselectedSelectedTransition; - } - else - { - mPaintState = SelectedState; - } - break; - } - default: - { - break; } } } -void PushButton::OnDisabled( bool disabled ) +Property::Value PushButton::GetProperty( BaseObject* object, Property::Index propertyIndex ) { - Actor& buttonImage = GetButtonImage(); - Actor& selectedImage = GetSelectedImage(); - Actor& backgroundImage = GetBackgroundImage(); - Actor& disabledImage = GetDisabledImage(); - Actor& disabledBackgroundImage = GetDisabledBackgroundImage(); - Actor& fadeOutButtonImage = GetFadeOutButtonImage(); - - switch( mPaintState ) - { - case UnselectedState: - { - if( disabled ) - { - StopFadeOutAnimation(); - FadeOutImage( Background, backgroundImage ); - FadeOutImage( Foreground, buttonImage ); - FadeInImage( disabledBackgroundImage ); - FadeInImage( disabledImage ); - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage ) - { - mPaintState = UnselectedDisabledTransition; - } - else - { - mPaintState = DisabledUnselectedState; - } - } - break; - } - case SelectedState: + Property::Value value; + + Toolkit::PushButton pushButton = Toolkit::PushButton::DownCast( Dali::BaseHandle( object ) ); + + if ( pushButton ) { - if( disabled ) + PushButton& pushButtonImpl( GetImplementation( pushButton ) ); + + switch ( propertyIndex ) { - StopFadeOutAnimation(); - FadeOutImage( Background, backgroundImage ); - FadeOutImage( Foreground, selectedImage ); - FadeInImage( disabledBackgroundImage ); - FadeInImage( disabledImage ); - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage ) - { - mPaintState = SelectedDisabledTransition; - } - else + case Toolkit::PushButton::Property::UNSELECTED_ICON: { - mPaintState = DisabledSelectedState; + value = pushButtonImpl.GetIcon( UNSELECTED_DECORATION ); + break; } - } - break; - } - case DisabledUnselectedState: - { - if( !disabled ) - { - StopFadeOutAnimation(); - FadeOutImage( Background, disabledBackgroundImage ); - FadeOutImage( Foreground, disabledImage ); - FadeInImage( backgroundImage ); - FadeInImage( buttonImage ); - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage ) + case Toolkit::PushButton::Property::SELECTED_ICON: { - mPaintState = DisabledUnselectedTransition; + value = pushButtonImpl.GetIcon( UNSELECTED_DECORATION ); + break; } - else + case Toolkit::PushButton::Property::ICON_ALIGNMENT: { - mPaintState = UnselectedState; + value = Scripting::GetLinearEnumerationName< IconAlignment >( pushButtonImpl.GetIconAlignment(), IconAlignmentTable, IconAlignmentTableCount ); + break; } - } - break; - } - case DisabledSelectedState: - { - if( !disabled ) - { - StopFadeOutAnimation(); - FadeOutImage( Background, disabledBackgroundImage ); - FadeOutImage( Foreground, disabledImage ); - FadeInImage( backgroundImage ); - FadeInImage( selectedImage ); - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage ) + case Toolkit::PushButton::Property::LABEL_PADDING: { - mPaintState = DisabledSelectedTransition; + value = pushButtonImpl.GetLabelPadding(); + break; } - else + case Toolkit::PushButton::Property::ICON_PADDING: { - mPaintState = SelectedState; + value = pushButtonImpl.GetIconPadding(); + break; } } - break; } - case UnselectedSelectedTransition: - { - if( disabled ) - { - float opacity = 1.f; - if( fadeOutButtonImage ) - { - opacity = fadeOutButtonImage.GetCurrentOpacity(); - } - StopFadeOutAnimation(); - StopFadeInAnimation(); - - FadeOutImage( Foreground, selectedImage, 1.f - opacity ); - FadeOutImage( Background, backgroundImage ); - FadeInImage( disabledImage ); - FadeInImage( disabledBackgroundImage ); + return value; +} - StartFadeOutAnimation(); - StartFadeInAnimation(); +void PushButton::OnLabelSet( bool noPadding ) +{ + Actor& label = GetLabelActor(); - if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage ) - { - mPaintState = SelectedDisabledTransition; - } - else - { - mPaintState = DisabledSelectedState; - } - } - break; - } - case SelectedUnselectedTransition: + if( label ) { - if( disabled ) + if( noPadding ) { - float opacity = 1.f; - if( fadeOutButtonImage ) - { - opacity = fadeOutButtonImage.GetCurrentOpacity(); - } - StopFadeOutAnimation(); - StopFadeInAnimation(); - - FadeOutImage( Foreground, buttonImage, 1.f - opacity ); - FadeOutImage( Background, backgroundImage ); - - FadeInImage( disabledImage ); - FadeInImage( disabledBackgroundImage ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage ) - { - mPaintState = UnselectedDisabledTransition; - } - else - { - mPaintState = DisabledUnselectedState; - } + mLabelPadding = Padding( 0.0f, 0.0f, 0.0f, 0.0f ); } - break; - } - case UnselectedDisabledTransition: - { - if( !disabled ) - { - float opacity = 1.f; - if( fadeOutButtonImage ) - { - opacity = fadeOutButtonImage.GetCurrentOpacity(); - } - StopFadeOutAnimation( false ); - StopFadeInAnimation(); - - FadeOutImage( Foreground, disabledImage, 1.f - opacity ); - FadeOutImage( Background, disabledBackgroundImage, 1.f - opacity ); - FadeInImage( buttonImage, opacity ); - FadeInImage( backgroundImage, opacity ); - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage ) - { - mPaintState = DisabledUnselectedTransition; - } - else - { - mPaintState = UnselectedState; - } - } - break; - } - case DisabledUnselectedTransition: - { - if( disabled ) + Toolkit::TextLabel textLabel = Toolkit::TextLabel::DownCast( label ); + if( textLabel ) { - float opacity = 1.f; - if( fadeOutButtonImage ) - { - opacity = fadeOutButtonImage.GetCurrentOpacity(); - } - StopFadeOutAnimation( false ); - StopFadeInAnimation(); - - FadeOutImage( Foreground, buttonImage, 1.f - opacity ); - FadeOutImage( Background, backgroundImage, 1.f - opacity ); - FadeInImage( disabledImage, opacity ); - FadeInImage( disabledBackgroundImage, opacity ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage ) - { - mPaintState = UnselectedDisabledTransition; - } - else - { - mPaintState = DisabledUnselectedState; - } + textLabel.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, false ); } - break; } - case SelectedDisabledTransition: - { - if( !disabled ) - { - float opacity = 1.f; - if( fadeOutButtonImage ) - { - opacity = fadeOutButtonImage.GetCurrentOpacity(); - } - StopFadeOutAnimation( false ); - StopFadeInAnimation(); + ConfigureSizeNegotiation(); +} - FadeOutImage( Foreground, disabledImage, 1.f - opacity ); - FadeOutImage( Background, disabledBackgroundImage, 1.f - opacity ); - FadeInImage( selectedImage, opacity ); - FadeInImage( backgroundImage, opacity ); +void PushButton::OnButtonImageSet() +{ + ConfigureSizeNegotiation(); +} - StartFadeOutAnimation(); - StartFadeInAnimation(); +void PushButton::OnSelectedImageSet() +{ + ConfigureSizeNegotiation(); +} - if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage ) - { - mPaintState = DisabledSelectedTransition; - } - else - { - mPaintState = SelectedState; - } - } - break; - } - case DisabledSelectedTransition: - { - if( disabled ) - { - float opacity = 1.f; - if( fadeOutButtonImage ) - { - opacity = fadeOutButtonImage.GetCurrentOpacity(); - } - StopFadeOutAnimation( false ); - StopFadeInAnimation(); +void PushButton::OnBackgroundImageSet() +{ + ConfigureSizeNegotiation(); +} - FadeOutImage( Foreground, selectedImage, 1.f - opacity ); - FadeOutImage( Background, backgroundImage, 1.f - opacity ); - FadeInImage( disabledImage, opacity ); - FadeInImage( disabledBackgroundImage, opacity ); +void PushButton::OnSelectedBackgroundImageSet() +{ + ConfigureSizeNegotiation(); +} - StartFadeOutAnimation(); - StartFadeInAnimation(); +void PushButton::OnDisabledImageSet() +{ + ConfigureSizeNegotiation(); +} - if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage ) - { - mPaintState = SelectedDisabledTransition; - } - else - { - mPaintState = DisabledSelectedState; - } - } - break; - } - default: - break; - } +void PushButton::OnDisabledSelectedImageSet() +{ + ConfigureSizeNegotiation(); } -void PushButton::OnPressed() +void PushButton::OnDisabledBackgroundImageSet() { - Actor& selectedImage = GetSelectedImage(); - Actor& buttonImage = GetButtonImage(); - Actor& fadeOutButtonImage = GetFadeOutButtonImage(); + ConfigureSizeNegotiation(); +} - switch( mPaintState ) +void PushButton::OnSizeSet( const Vector3& targetSize ) +{ + if( targetSize != mSize ) { - case UnselectedState: - { - StopFadeOutAnimation(); - FadeOutImage( Foreground, buttonImage ); - FadeInImage( selectedImage ); - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( buttonImage || selectedImage ) - { - mPaintState = UnselectedSelectedTransition; - } - else - { - mPaintState = SelectedState; - } - break; - } - case UnselectedSelectedTransition: - { - if( !IsAutoRepeating() ) - { - mPaintState = SelectedUnselectedTransition; - } - break; - } - case SelectedUnselectedTransition: - { - float opacity = 1.f; - if( fadeOutButtonImage ) - { - opacity = fadeOutButtonImage.GetCurrentOpacity(); - } - StopFadeOutAnimation( false ); - StopFadeInAnimation(); - - FadeOutImage( Foreground, buttonImage, 1.f - opacity ); - FadeInImage( selectedImage, opacity ); + mSize = targetSize; - StartFadeOutAnimation(); - StartFadeInAnimation(); + Actor& label = GetLabelActor(); - if( buttonImage || selectedImage ) - { - mPaintState = UnselectedSelectedTransition; - } - else - { - mPaintState = SelectedState; - } - break; + if( label ) + { + label.SetSize( mSize ); } - default: - break; } } -void PushButton::OnReleased() +void PushButton::PrepareForTranstionIn( Actor actor ) { - Actor& selectedImage = GetSelectedImage(); - Actor& buttonImage = GetButtonImage(); - Actor& fadeOutButtonImage = GetFadeOutButtonImage(); - - switch( mPaintState ) - { - case SelectedState: - { - StopFadeOutAnimation(); - FadeOutImage( Foreground, selectedImage ); - FadeInImage( buttonImage ); - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( buttonImage || selectedImage ) - { - mPaintState = SelectedUnselectedTransition; - } - else - { - mPaintState = UnselectedState; - } - break; - } - case UnselectedSelectedTransition: - { - float opacity = 1.f; - if( fadeOutButtonImage ) - { - opacity = fadeOutButtonImage.GetCurrentOpacity(); - } - StopFadeOutAnimation( false ); - StopFadeInAnimation(); - - FadeOutImage( Foreground, selectedImage, 1.f - opacity ); - FadeInImage( buttonImage, opacity ); + actor.SetOpacity( 0.0f ); +} - StartFadeOutAnimation(); - StartFadeInAnimation(); +void PushButton::PrepareForTranstionOut( Actor actor ) +{ + actor.SetOpacity( 1.0f ); +} - if( buttonImage || selectedImage ) - { - mPaintState = SelectedUnselectedTransition; - } - else - { - mPaintState = UnselectedState; - } - break; - } - default: - { - break; - } - } +void PushButton::OnTransitionIn( Actor actor ) +{ + FadeImageTo( actor, 1.f ); } -void PushButton::OnClicked() +void PushButton::OnTransitionOut( Actor actor ) { - OnReleased(); + FadeImageTo( actor, 0.0f ); } -void PushButton::OnControlSizeSet( const Vector3& targetSize ) +void PushButton::FadeImageTo( Actor actor, float opacity ) { - if( targetSize != mSize ) + if( actor ) { - mSize = targetSize; + Dali::Animation transitionAnimation = GetTransitionAnimation(); + DALI_ASSERT_DEBUG( transitionAnimation ); - Actor& label = GetLabel(); - - if( label ) + if( transitionAnimation ) { - label.SetSize( mSize ); + transitionAnimation.AnimateTo( Property( actor, Actor::Property::COLOR_ALPHA ), opacity ); } } } Vector3 PushButton::GetNaturalSize() { - Vector3 size = Control::GetNaturalSize(); + Vector3 size; - const bool widthIsZero = EqualsZero( size.width ); - const bool heightIsZero = EqualsZero( size.height ); + // If label, test against it's size + Toolkit::TextLabel label = Toolkit::TextLabel::DownCast( GetLabelActor() ); - if( widthIsZero || heightIsZero ) + Actor icon = GetDecoration( UNSELECTED_DECORATION ); + if( label || icon ) { - // If background and background not scale9 try get size from that - ImageActor imageActor = FindImageActor( GetButtonImage() ); - if( imageActor && imageActor.GetStyle() != ImageActor::STYLE_NINE_PATCH ) - { - Vector3 imageSize = RelayoutHelper::GetNaturalSize( imageActor ); - - if( widthIsZero ) - { - size.width = imageSize.width; - } + Vector3 labelSize( Vector3::ZERO ); + Vector3 iconSize( Vector3::ZERO ); - if( heightIsZero ) - { - size.height = imageSize.height; - } + if( label ) + { + Vector3 labelNaturalSize = label.GetNaturalSize(); + labelSize.width = labelNaturalSize.width + mLabelPadding.left + mLabelPadding.right; + labelSize.height = labelNaturalSize.height + mLabelPadding.top + mLabelPadding.bottom; } - ImageActor backgroundImageActor = FindImageActor( GetBackgroundImage() ); - if( backgroundImageActor && backgroundImageActor.GetStyle() != ImageActor::STYLE_NINE_PATCH ) + if( icon ) { - Vector3 imageSize = RelayoutHelper::GetNaturalSize( backgroundImageActor ); + Vector3 iconNaturalSize = icon.GetNaturalSize(); + iconSize.width = iconNaturalSize.width + mIconPadding.left + mIconPadding.right; + iconSize.height = iconNaturalSize.height + mIconPadding.top + mIconPadding.bottom; - if( widthIsZero ) + switch( mIconAlignment ) { - size.width = std::max( size.width, imageSize.width ); - } - - if( heightIsZero ) - { - size.height = std::max( size.height, imageSize.height ); + case LEFT: + case RIGHT: + { + size.width = labelSize.width + iconSize.width; + size.height = std::max( labelSize.height, iconSize.height ); + break; + } + case TOP: + case BOTTOM: + { + size.width = std::max( labelSize.width, iconSize.width ); + size.height = labelSize.height + iconSize.height; + break; + } } } + else + { + // No icon, so size is the same as label size. + // (If there is no label this is zero). + size = labelSize; + } + } + else + { + // Check Image and Background image and use the largest size as the control's Natural size. + SizeOfActorIfLarger( GetUnselectedImage(), size ); + SizeOfActorIfLarger( GetBackgroundImage(), size ); } return size; } -Actor& PushButton::GetFadeOutButtonImage() +void PushButton::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ) { - return mFadeOutButtonContent; + ConfigureSizeNegotiation(); } -Actor& PushButton::GetFadeOutBackgroundImage() +void PushButton::ConfigureSizeNegotiation() { - return mFadeOutBackgroundContent; -} + std::vector< Actor > images; + images.reserve( 7 ); -void PushButton::AddToFadeInAnimation( const Actor& actor ) -{ - if( !mFadeInAnimation ) + images.push_back( GetUnselectedImage() ); + images.push_back( GetSelectedImage() ); + images.push_back( GetSelectedBackgroundImage() ); + images.push_back( GetBackgroundImage() ); + images.push_back( GetDisabledImage() ); + images.push_back( GetDisabledSelectedImage() ); + images.push_back( GetDisabledBackgroundImage() ); + + Actor label = GetLabelActor(); + + for( unsigned int i = 0; i < Dimension::DIMENSION_COUNT; ++i ) { - mFadeInAnimation = Dali::Animation::New( GetAnimationTime() ); + ConfigureSizeNegotiationDimension( static_cast< Dimension::Type >( 1 << i ), images, label ); } - mFadeInAnimation.OpacityTo( actor, 1.f ); -} + // Add any vertical padding directly to the actors. + Actor icon = GetDecoration( UNSELECTED_DECORATION ); + Actor selectedIcon = GetDecoration( SELECTED_DECORATION ); + bool iconExists = icon || selectedIcon; -void PushButton::StartFadeInAnimation() -{ - if( mFadeInAnimation ) + if( label ) { - mFadeInAnimation.FinishedSignal().Connect( this, &PushButton::FadeInAnimationFinished ); - mFadeInAnimation.Play(); + label.SetPadding( mLabelPadding ); } -} - -void PushButton::StopFadeInAnimation() -{ - if( mFadeInAnimation ) + if( icon ) { - mFadeInAnimation.Clear(); - mFadeInAnimation.Reset(); + icon.SetPadding( mIconPadding ); } -} - -void PushButton::AddToFadeOutAnimation( const Actor& actor ) -{ - if( !mFadeOutAnimation ) + if( selectedIcon ) { - mFadeOutAnimation = Dali::Animation::New( GetAnimationTime() ); + selectedIcon.SetPadding( mIconPadding ); } - mFadeOutAnimation.OpacityTo( actor, 0.f ); -} + // Calculate and apply horizontal alignments and offsets + // to text and icon (depending on existence). + Vector3 iconPosition( Vector3::ZERO ); + Vector3 labelPosition( Vector3::ZERO ); + Vector3 iconAnchoring( AnchorPoint::CENTER ); + Vector3 labelAnchoring( AnchorPoint::CENTER ); + std::string horizontalLabelAlignment = "CENTER"; + std::string verticalLabelAlignment = "CENTER"; -void PushButton::StartFadeOutAnimation() -{ - if( mFadeOutAnimation ) + if( iconExists && label ) { - mFadeOutAnimation.FinishedSignal().Connect( this, &PushButton::FadeOutAnimationFinished ); - mFadeOutAnimation.Play(); + // There is an icon and a label to lay out. + switch( mIconAlignment ) + { + case LEFT: + { + iconPosition.x = mIconPadding.left; + labelPosition.x = -mLabelPadding.right; + iconAnchoring = AnchorPoint::CENTER_LEFT; + labelAnchoring = AnchorPoint::CENTER_RIGHT; + horizontalLabelAlignment = "END"; + break; + } + case RIGHT: + { + iconPosition.x = -mIconPadding.right; + labelPosition.x = mLabelPadding.left; + iconAnchoring = AnchorPoint::CENTER_RIGHT; + labelAnchoring = AnchorPoint::CENTER_LEFT; + horizontalLabelAlignment = "BEGIN"; + break; + } + case TOP: + { + iconPosition.y = mIconPadding.top; + labelPosition.y = -mLabelPadding.bottom; + iconAnchoring = AnchorPoint::TOP_CENTER; + labelAnchoring = AnchorPoint::BOTTOM_CENTER; + verticalLabelAlignment = "BOTTOM"; + break; + } + case BOTTOM: + { + iconPosition.y = -mIconPadding.bottom; + labelPosition.y = mLabelPadding.top; + iconAnchoring = AnchorPoint::BOTTOM_CENTER; + labelAnchoring = AnchorPoint::TOP_CENTER; + verticalLabelAlignment = "TOP"; + break; + } + } } -} -void PushButton::StopFadeOutAnimation( bool remove ) -{ - if( mFadeOutAnimation ) + // Note: If there is only an icon, or only a label, the default values are now correct. + // Setup the icon(s) with the precalculated values. + if( icon ) { - mFadeOutAnimation.Clear(); - mFadeOutAnimation.Reset(); + icon.SetPosition( iconPosition ); + icon.SetParentOrigin( iconAnchoring ); + icon.SetAnchorPoint( iconAnchoring ); } - - if( remove ) + if( selectedIcon ) { - Actor& fadeOutButtonImage = GetFadeOutButtonImage(); - Actor& fadeOutBackgroundImage = GetFadeOutBackgroundImage(); - - if( fadeOutButtonImage && fadeOutButtonImage.GetParent() ) - { - fadeOutButtonImage.GetParent().Remove( fadeOutButtonImage ); - } - - if( fadeOutBackgroundImage && fadeOutBackgroundImage.GetParent() ) - { - fadeOutBackgroundImage.GetParent().Remove( fadeOutBackgroundImage ); - } - - fadeOutButtonImage.Reset(); - fadeOutBackgroundImage.Reset(); + selectedIcon.SetPosition( iconPosition ); + selectedIcon.SetParentOrigin( iconAnchoring ); + selectedIcon.SetAnchorPoint( iconAnchoring ); } -} -void PushButton::FadeInImage( Actor& image, float opacity ) -{ - if( image ) + // Setup the label. + if( label ) { - image.SetOpacity( opacity ); - if( !image.GetParent() ) - { - Self().Add( image ); - } - - AddToFadeInAnimation( image ); + label.SetPosition( labelPosition ); + label.SetParentOrigin( labelAnchoring ); + label.SetAnchorPoint( labelAnchoring ); + label.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, horizontalLabelAlignment ); + label.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, verticalLabelAlignment ); } + + RelayoutRequest(); } -void PushButton::FadeOutImage( ImageLayer layer, Actor& image, float opacity ) -{ - if( image ) - { - Actor& fadeOutButtonImage = GetFadeOutButtonImage(); - Actor& fadeOutBackgroundImage = GetFadeOutBackgroundImage(); - Actor& actorLayer = ( ( Background == layer ) ? fadeOutBackgroundImage : fadeOutButtonImage ); +void PushButton::ConfigureSizeNegotiationDimension( Dimension::Type dimension, const std::vector< Actor >& images, Actor& label ) +{ + ResizePolicy::Type imageResizePolicy = ResizePolicy::FILL_TO_PARENT; + ResizePolicy::Type labelResizePolicy = ResizePolicy::FILL_TO_PARENT; - actorLayer = image; - actorLayer.SetOpacity( opacity ); + ResizePolicy::Type resizePolicy = Self().GetResizePolicy( dimension ); - AddToFadeOutAnimation( actorLayer ); - } -} - -void PushButton::FadeOutAnimationFinished( Dali::Animation& source ) -{ - switch( mPaintState ) + if( resizePolicy == ResizePolicy::FIT_TO_CHILDREN || resizePolicy == ResizePolicy::USE_NATURAL_SIZE ) { - case UnselectedSelectedTransition: - { - mPaintState = SelectedState; - break; - } - case SelectedUnselectedTransition: - { - mPaintState = UnselectedState; - break; - } - case UnselectedDisabledTransition: - { - mPaintState = DisabledUnselectedState; - break; - } - case DisabledUnselectedTransition: - { - mPaintState = UnselectedState; - break; - } - case SelectedDisabledTransition: - { - mPaintState = DisabledSelectedState; - break; - } - case DisabledSelectedTransition: + if( label ) { - mPaintState = SelectedState; - break; + labelResizePolicy = ResizePolicy::USE_NATURAL_SIZE; } - default: + else { - break; + imageResizePolicy = ResizePolicy::USE_NATURAL_SIZE; } } - StopFadeOutAnimation(); -} + if( label ) + { + label.SetResizePolicy( labelResizePolicy, dimension ); + } -void PushButton::FadeInAnimationFinished( Dali::Animation& source ) -{ - switch( mPaintState ) + for( std::vector< Actor >::const_iterator it = images.begin(), itEnd = images.end(); it != itEnd; ++it ) { - case UnselectedSelectedTransition: - { - mPaintState = SelectedState; - break; - } - case SelectedUnselectedTransition: - { - mPaintState = UnselectedState; - break; - } - case UnselectedDisabledTransition: - { - mPaintState = DisabledUnselectedState; - break; - } - case DisabledUnselectedTransition: - { - mPaintState = UnselectedState; - break; - } - case SelectedDisabledTransition: + Actor actor = *it; + if( actor ) { - mPaintState = DisabledSelectedState; - break; - } - case DisabledSelectedTransition: - { - mPaintState = SelectedState; - break; - } - default: - { - break; + actor.SetResizePolicy( imageResizePolicy, dimension ); } } - - StopFadeInAnimation(); } + } // namespace Internal } // namespace Toolkit