X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fpush-button-impl.cpp;h=f07eb329ccf6c6f35ce1eae89db0d41f7d21c7f8;hb=a6f34ab2df1f2418c037366030a4dcfbcda29847;hp=08948ded567795e51eea622dfc9559b0472c4ece;hpb=cc82bd9b187cda8fe2c8336b73fd1fa9376cfebd;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 08948de..f07eb32 100644 --- a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp @@ -23,6 +23,7 @@ #include // INTERNAL INCLUDES +#include namespace Dali { @@ -37,11 +38,6 @@ 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 ); BaseHandle Create() @@ -57,24 +53,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 @@ -96,8 +86,7 @@ Dali::Toolkit::PushButton PushButton::New() PushButton::PushButton() : Button(), - mSize(), - mPaintState( UnselectedState ) + mSize() { SetAnimationTime( ANIMATION_TIME ); } @@ -106,481 +95,428 @@ PushButton::~PushButton() { } -void PushButton::SetButtonImage( Actor image ) +void PushButton::OnButtonInitialize() { - Actor& buttonImage = GetButtonImage(); - Actor& fadeOutButtonImage = GetFadeOutButtonImage(); + // Push button requires the Leave event. + Actor self = Self(); + self.SetLeaveRequired( true ); - switch( mPaintState ) - { - case UnselectedState: - { - if( buttonImage && buttonImage.GetParent() ) - { - StopFadeOutAnimation(); - FadeOutImage( Foreground, buttonImage ); + // Set resize policy to natural size so that buttons will resize to background images + self.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); +} - buttonImage = image; +void PushButton::OnLabelSet() +{ + Actor& label = GetLabel(); - FadeInImage( buttonImage, 0.0f, 0 ); + if( label ) + { + label.SetAnchorPoint( AnchorPoint::CENTER ); + label.SetParentOrigin( ParentOrigin::CENTER ); - StartFadeOutAnimation(); - StartFadeInAnimation(); - } - else - { - buttonImage = image; - Self().Insert( 0, buttonImage ); - } - break; - } - case UnselectedSelectedTransition: // FALLTHROUGH - case UnselectedDisabledTransition: + Toolkit::TextLabel textLabel = Toolkit::TextLabel::DownCast( label ); + if( textLabel ) { - float opacity = 1.f; - if( fadeOutButtonImage ) - { - opacity = fadeOutButtonImage.GetCurrentOpacity(); - } - StopFadeOutAnimation(); + textLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + textLabel.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, true ); + } - // Replaces the button image. - buttonImage = image; + ConfigureSizeNegotiation(); + } +} - Self().Insert( 0, buttonImage ); - FadeOutImage( Foreground, buttonImage, opacity ); +void PushButton::OnButtonImageSet() +{ + ConfigureSizeNegotiation(); + RelayoutRequest(); +} - StartFadeOutAnimation(); - break; - } - case SelectedUnselectedTransition: // FALLTHROUGH - case DisabledUnselectedTransition: - { - StopFadeInAnimation(); - Self().Remove( buttonImage ); +void PushButton::OnSelectedImageSet() +{ + ConfigureSizeNegotiation(); + RelayoutRequest(); +} - buttonImage = image; +void PushButton::OnBackgroundImageSet() +{ + ConfigureSizeNegotiation(); + RelayoutRequest(); +} - FadeInImage( buttonImage, 0.0f, 0 ); - StartFadeInAnimation(); - break; - } - default: - buttonImage = image; - break; - } +void PushButton::OnSelectedBackgroundImageSet() +{ + ConfigureSizeNegotiation(); + RelayoutRequest(); +} + +void PushButton::OnDisabledImageSet() +{ + ConfigureSizeNegotiation(); + RelayoutRequest(); +} - buttonImage.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - buttonImage.SetParentOrigin( ParentOrigin::TOP_LEFT ); - buttonImage.SetPosition( 0.f, 0.f, FOREGROUND_DEPTH ); - buttonImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); - buttonImage.SetName( "BUTTON_IMAGE" ); +void PushButton::OnDisabledBackgroundImageSet() +{ + ConfigureSizeNegotiation(); + RelayoutRequest(); } -void PushButton::SetSelectedImage( Actor image ) +bool PushButton::OnSelected() { + Actor& buttonImage = GetButtonImage(); Actor& selectedImage = GetSelectedImage(); - Actor& fadeOutButtonImage = GetFadeOutButtonImage(); + Actor& selectedBackgroundImage = GetSelectedBackgroundImage(); - switch( mPaintState ) + PaintState paintState = GetPaintState(); + + switch( paintState ) { + case UnselectedState: + { + FadeOutImage( buttonImage ); + FadeInImage( selectedBackgroundImage ); + FadeInImage( selectedImage ); + StartTransitionAnimation(); + break; + } case SelectedState: { - if( selectedImage && selectedImage.GetParent() ) - { - StopFadeOutAnimation(); - FadeOutImage( Foreground, selectedImage ); - - selectedImage = image; - - FadeInImage( selectedImage, 0.0f, 0 ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); - } - else - { - selectedImage = image; - Self().Insert( 0, selectedImage ); - } + FadeOutImage( selectedBackgroundImage ); + FadeOutImage( selectedImage ); + FadeInImage( buttonImage ); + StartTransitionAnimation(); break; } - case SelectedUnselectedTransition: // FALLTHROUGH - case SelectedDisabledTransition: + case UnselectedSelectedTransition: { float opacity = 1.f; - if( fadeOutButtonImage ) + if( selectedImage ) { - opacity = fadeOutButtonImage.GetCurrentOpacity(); + opacity = selectedImage.GetCurrentOpacity(); } - StopFadeOutAnimation(); - - // Replaces the button image. - selectedImage = image; - Self().Insert( 0, selectedImage ); - FadeOutImage( Foreground, selectedImage, opacity ); + StopTransitionAnimation( false ); + FadeOutImage( selectedBackgroundImage, opacity ); + FadeOutImage( selectedImage, opacity ); + FadeInImage( buttonImage, 1.f - opacity ); + StartTransitionAnimation(); + break; + } + case SelectedUnselectedTransition: + { + float opacity = 0.f; + if( selectedImage ) + { + opacity = selectedImage.GetCurrentOpacity(); + } - StartFadeOutAnimation(); + StopTransitionAnimation( false ); + FadeOutImage( buttonImage, 1.f - opacity ); + FadeInImage( selectedBackgroundImage, opacity ); + FadeInImage( selectedImage, opacity ); + StartTransitionAnimation(); + break; + } + case DisabledUnselectedTransition: + { + StopTransitionAnimation(); + FadeOutImage( buttonImage ); + FadeInImage( selectedBackgroundImage ); + FadeInImage( selectedImage ); + StartTransitionAnimation(); break; } - case UnselectedSelectedTransition: // FALLTHROUGH case DisabledSelectedTransition: { - StopFadeInAnimation(); - Self().Remove( selectedImage ); - - selectedImage = image; - - FadeInImage( selectedImage, 0.0f, 0 ); - StartFadeInAnimation(); + StopTransitionAnimation(); + FadeOutImage( selectedBackgroundImage ); + FadeOutImage( selectedImage ); + FadeInImage( buttonImage ); + StartTransitionAnimation(); break; } default: - selectedImage = image; + { break; + } + } + + if( mTransitionAnimation ) + { + return true; } - selectedImage.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - selectedImage.SetParentOrigin( ParentOrigin::TOP_LEFT ); - selectedImage.SetPosition( 0.f, 0.f, FOREGROUND_DEPTH ); - selectedImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + return false; } -void PushButton::SetBackgroundImage( Actor image ) +bool PushButton::OnDisabled() { + Actor& buttonImage = GetButtonImage(); + Actor& selectedImage = GetSelectedImage(); + Actor& selectedBackgroundImage = GetSelectedBackgroundImage(); Actor& backgroundImage = GetBackgroundImage(); - Actor& fadeOutBackgroundImage = GetFadeOutBackgroundImage(); + Actor& disabledImage = GetDisabledImage(); + Actor& disabledSelectedImage = GetDisabledSelectedImage(); + Actor& disabledBackgroundImage = GetDisabledBackgroundImage(); - switch( mPaintState ) + PaintState paintState = GetPaintState(); + + switch( paintState ) { - case UnselectedState: // FALLTHROUGH + case UnselectedState: + { + FadeOutImage( backgroundImage ); + FadeOutImage( buttonImage ); + FadeInImage( disabledBackgroundImage ); + FadeInImage( disabledImage ); + StartTransitionAnimation(); + break; + } case SelectedState: + { + FadeOutImage( backgroundImage ); + FadeOutImage( selectedBackgroundImage ); + FadeOutImage( selectedImage ); + FadeInImage( disabledBackgroundImage ); + FadeInImage( disabledSelectedImage ); + StartTransitionAnimation(); + break; + } + case DisabledUnselectedState: + { + FadeOutImage( disabledBackgroundImage ); + FadeOutImage( disabledImage ); + FadeInImage( backgroundImage ); + FadeInImage( buttonImage ); + StartTransitionAnimation(); + break; + } + case DisabledSelectedState: + { + FadeOutImage( disabledBackgroundImage ); + FadeOutImage( disabledSelectedImage ); + FadeInImage( backgroundImage ); + FadeInImage( selectedBackgroundImage ); + FadeInImage( selectedImage ); + StartTransitionAnimation(); + break; + } case UnselectedSelectedTransition: - case SelectedUnselectedTransition: { - if( backgroundImage && backgroundImage.GetParent() ) - { - StopFadeOutAnimation(); - FadeOutImage( Background, backgroundImage ); - - backgroundImage = image; - - FadeInImage( backgroundImage, 0.0f, 0 ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); - } - else + float opacity = 1.f; + if( selectedImage ) { - backgroundImage = image; - Self().Insert( 0, backgroundImage ); + opacity = selectedImage.GetCurrentOpacity(); } + + StopTransitionAnimation(); + FadeOutImage( backgroundImage ); + FadeOutImage( selectedBackgroundImage, opacity ); + FadeOutImage( selectedImage, opacity ); + FadeInImage( disabledBackgroundImage ); + FadeInImage( disabledSelectedImage ); + StartTransitionAnimation(); break; } - case UnselectedDisabledTransition: // FALLTHROUGH - case SelectedDisabledTransition: + case SelectedUnselectedTransition: { float opacity = 1.f; - if( fadeOutBackgroundImage ) + if( buttonImage ) { - opacity = fadeOutBackgroundImage.GetCurrentOpacity(); + opacity = buttonImage.GetCurrentOpacity(); } - StopFadeOutAnimation(); - - // Replaces the button image. - backgroundImage = image; - - Self().Insert( 0, backgroundImage ); - FadeOutImage( Background, backgroundImage, opacity ); - StartFadeOutAnimation(); + StopTransitionAnimation(); + FadeOutImage( backgroundImage ); + FadeOutImage( buttonImage, opacity ); + FadeInImage( disabledBackgroundImage ); + FadeInImage( disabledImage ); + StartTransitionAnimation(); break; } - case DisabledUnselectedTransition: // FALLTHROUGH - case DisabledSelectedTransition: + case UnselectedDisabledTransition: { - StopFadeInAnimation(); - Self().Remove( backgroundImage ); - - backgroundImage = image; + float opacity = 1.f; + if( disabledImage ) + { + opacity = disabledImage.GetCurrentOpacity(); + } - FadeInImage( backgroundImage, 0.0f, 0 ); - StartFadeInAnimation(); - break; - } - default: - backgroundImage = image; + StopTransitionAnimation( false ); + FadeOutImage( disabledBackgroundImage, opacity ); + FadeOutImage( disabledImage, opacity ); + FadeInImage( backgroundImage, 1.f - opacity ); + FadeInImage( buttonImage, 1.f - opacity ); + StartTransitionAnimation(); break; } - - backgroundImage.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - backgroundImage.SetParentOrigin( ParentOrigin::TOP_LEFT ); - backgroundImage.SetPosition( 0.f, 0.f, BACKGROUND_DEPTH ); - backgroundImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); -} - -void PushButton::SetDisabledImage( Actor image ) -{ - Actor& disabledImage = GetDisabledImage(); - Actor& fadeOutButtonImage = GetFadeOutButtonImage(); - - switch( mPaintState ) - { - case DisabledUnselectedState: // FALLTHROUGH - case DisabledSelectedState: + case DisabledUnselectedTransition: { - if( disabledImage && disabledImage.GetParent() ) - { - StopFadeOutAnimation(); - FadeOutImage( Foreground, disabledImage ); - - disabledImage = image; - - FadeInImage( disabledImage, 0.0f, 0 ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); - } - else + float opacity = 1.f; + if( buttonImage ) { - disabledImage = image; - Self().Add( disabledImage ); + opacity = buttonImage.GetCurrentOpacity(); } + + StopTransitionAnimation( false ); + FadeOutImage( backgroundImage, opacity ); + FadeOutImage( buttonImage, opacity ); + FadeInImage( disabledBackgroundImage, 1.f - opacity ); + FadeInImage( disabledImage, 1.f - opacity ); + StartTransitionAnimation(); break; } - case UnselectedDisabledTransition: // FALLTHROUGH case SelectedDisabledTransition: { - StopFadeInAnimation(); - Self().Remove( disabledImage ); - - disabledImage = image; + float opacity = 1.f; + if( disabledSelectedImage ) + { + opacity = disabledSelectedImage.GetCurrentOpacity(); + } - FadeInImage( disabledImage, 0.0f, 0 ); - StartFadeInAnimation(); + StopTransitionAnimation( false ); + FadeOutImage( disabledBackgroundImage, opacity ); + FadeOutImage( disabledSelectedImage, opacity ); + FadeInImage( backgroundImage, 1.f - opacity ); + FadeInImage( selectedBackgroundImage, 1.f - opacity ); + FadeInImage( selectedImage, 1.f - opacity ); + StartTransitionAnimation(); break; } - case DisabledUnselectedTransition: // FALLTHROUGH case DisabledSelectedTransition: { float opacity = 1.f; - if( fadeOutButtonImage ) + if( selectedImage ) { - opacity = fadeOutButtonImage.GetCurrentOpacity(); + opacity = selectedImage.GetCurrentOpacity(); } - StopFadeOutAnimation(); - - // Replaces the button image. - disabledImage = image; - - Self().Add( disabledImage ); - FadeOutImage( Foreground, disabledImage, opacity ); - StartFadeOutAnimation(); + StopTransitionAnimation( false ); + FadeOutImage( backgroundImage, opacity ); + FadeOutImage( selectedBackgroundImage, opacity ); + FadeOutImage( selectedImage, opacity ); + FadeInImage( disabledBackgroundImage, 1.f - opacity ); + FadeInImage( disabledSelectedImage, 1.f - opacity ); + StartTransitionAnimation(); break; } - default: - disabledImage = image; - break; } - disabledImage.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - disabledImage.SetParentOrigin( ParentOrigin::TOP_LEFT ); - disabledImage.SetPosition( 0.f, 0.f, FOREGROUND_DEPTH ); - disabledImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + if( mTransitionAnimation ) + { + return true; + } + + return false; } -void PushButton::SetDisabledBackgroundImage( Actor image ) +bool PushButton::OnPressed() { - Actor& disabledBackgroundImage = GetDisabledBackgroundImage(); - Actor& fadeOutBackgroundImage = GetFadeOutBackgroundImage(); + Actor& buttonImage = GetButtonImage(); + Actor& selectedImage = GetSelectedImage(); + Actor& selectedBackgroundImage = GetSelectedBackgroundImage(); - switch( mPaintState ) + PaintState paintState = GetPaintState(); + + switch( paintState ) { - case DisabledUnselectedState: // FALLTHROUGH - case DisabledSelectedState: + case UnselectedState: { - if( disabledBackgroundImage && disabledBackgroundImage.GetParent() ) - { - StopFadeOutAnimation(); - FadeOutImage( Background, disabledBackgroundImage ); - - disabledBackgroundImage = image; - - FadeInImage( disabledBackgroundImage, 0.0f, 0 ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); - } - else - { - disabledBackgroundImage = image; - Self().Add( disabledBackgroundImage ); - } + FadeOutImage( buttonImage ); + FadeInImage( selectedBackgroundImage ); + FadeInImage( selectedImage ); + StartTransitionAnimation(); break; } - case UnselectedDisabledTransition: // FALLTHROUGH - case SelectedDisabledTransition: + case SelectedUnselectedTransition: { - StopFadeInAnimation(); - Self().Remove( disabledBackgroundImage ); - - disabledBackgroundImage = image; + float opacity = 1.f; + if( buttonImage ) + { + opacity = buttonImage.GetCurrentOpacity(); + } - FadeInImage( disabledBackgroundImage, 0.0f, 0 ); - StartFadeInAnimation(); + StopTransitionAnimation( false ); + FadeOutImage( buttonImage, opacity ); + FadeInImage( selectedBackgroundImage, 1.f - opacity ); + FadeInImage( selectedImage, 1.f - opacity ); + StartTransitionAnimation(); break; } - case DisabledUnselectedTransition: // FALLTHROUGH - case DisabledSelectedTransition: + case DisabledUnselectedTransition: { float opacity = 1.f; - if( fadeOutBackgroundImage ) + if( buttonImage ) { - opacity = fadeOutBackgroundImage.GetCurrentOpacity(); + opacity = buttonImage.GetCurrentOpacity(); } - StopFadeOutAnimation(); - - // Replaces the button image. - disabledBackgroundImage = image; - Self().Add( disabledBackgroundImage ); - FadeOutImage( Background, disabledBackgroundImage, opacity ); - - StartFadeOutAnimation(); + StopTransitionAnimation(); + FadeOutImage( buttonImage, opacity ); + FadeInImage( selectedBackgroundImage ); + FadeInImage( selectedImage ); + StartTransitionAnimation(); break; } default: - disabledBackgroundImage = image; break; } - disabledBackgroundImage.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - disabledBackgroundImage.SetParentOrigin( ParentOrigin::TOP_LEFT ); - disabledBackgroundImage.SetPosition( 0.f, 0.f, BACKGROUND_DEPTH ); - disabledBackgroundImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); -} - -void PushButton::OnButtonInitialize() -{ - // Push button requires the Leave event. - Actor root = Self(); - root.SetLeaveRequired( true ); - - // Set resize policy to natural size so that buttons will resize to background images - root.SetResizePolicy( USE_NATURAL_SIZE, ALL_DIMENSIONS ); -} - -void PushButton::OnLabelSet() -{ - Actor& label = GetLabel(); - - if( label ) + if( mTransitionAnimation ) { - label.SetAnchorPoint( AnchorPoint::CENTER ); - label.SetParentOrigin( ParentOrigin::CENTER ); - label.SetPosition( 0.f, 0.f, LABEL_DEPTH ); - label.SetSize( mSize ); - - Self().Add( label ); + return true; } + + return false; } -void PushButton::OnSelected( bool selected ) +bool PushButton::OnReleased() { - Actor& selectedImage = GetSelectedImage(); Actor& buttonImage = GetButtonImage(); - Actor& fadeOutButtonImage = GetFadeOutButtonImage(); + Actor& selectedImage = GetSelectedImage(); + Actor& selectedBackgroundImage = GetSelectedBackgroundImage(); - switch( mPaintState ) - { - case UnselectedState: - { - StopFadeOutAnimation(); - FadeOutImage( Foreground, buttonImage ); - FadeInImage( selectedImage, 0.0f, 0 ); - StartFadeOutAnimation(); - StartFadeInAnimation(); + PaintState paintState = GetPaintState(); - if( buttonImage || selectedImage ) - { - mPaintState = UnselectedSelectedTransition; - } - else - { - mPaintState = SelectedState; - } - break; - } + switch( paintState ) + { case SelectedState: { - StopFadeOutAnimation(); - FadeOutImage( Foreground, selectedImage ); - FadeInImage( buttonImage, 0.0f, 0 ); - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( buttonImage || selectedImage ) - { - mPaintState = SelectedUnselectedTransition; - } - else - { - mPaintState = UnselectedState; - } + FadeOutImage( selectedBackgroundImage ); + FadeOutImage( selectedImage ); + FadeInImage( buttonImage ); + StartTransitionAnimation(); break; } case UnselectedSelectedTransition: { float opacity = 1.f; - if( fadeOutButtonImage ) + if( selectedImage ) { - opacity = fadeOutButtonImage.GetCurrentOpacity(); + opacity = selectedImage.GetCurrentOpacity(); } - StopFadeOutAnimation( false ); - StopFadeInAnimation(); - - FadeOutImage( Foreground, selectedImage, 1.f - opacity ); - FadeInImage( buttonImage, opacity, 0 ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); - if( buttonImage || selectedImage ) - { - mPaintState = SelectedUnselectedTransition; - } - else - { - mPaintState = UnselectedState; - } + StopTransitionAnimation( false ); + FadeOutImage( selectedBackgroundImage, opacity ); + FadeOutImage( selectedImage, opacity ); + FadeInImage( buttonImage, 1.f - opacity ); + StartTransitionAnimation(); break; } - case SelectedUnselectedTransition: + case DisabledSelectedTransition: { - float opacity = 0.f; - if( fadeOutButtonImage ) + float opacity = 1.f; + if( selectedImage ) { - opacity = 1.f - fadeOutButtonImage.GetCurrentOpacity(); + opacity = selectedImage.GetCurrentOpacity(); } - StopFadeOutAnimation( false ); - StopFadeInAnimation(); - - FadeOutImage( Foreground, buttonImage, 1.f - opacity ); - FadeInImage( selectedImage, opacity, 0 ); - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( buttonImage || selectedImage ) - { - mPaintState = UnselectedSelectedTransition; - } - else - { - mPaintState = SelectedState; - } + StopTransitionAnimation(); + FadeOutImage( selectedBackgroundImage, opacity ); + FadeOutImage( selectedImage, opacity ); + FadeInImage( buttonImage ); + StartTransitionAnimation(); break; } default: @@ -588,648 +524,169 @@ void PushButton::OnSelected( bool selected ) break; } } + + if( mTransitionAnimation ) + { + return true; + } + + return false; } -void PushButton::OnDisabled( bool disabled ) +void PushButton::StopAllAnimations() { - Actor& buttonImage = GetButtonImage(); - Actor& selectedImage = GetSelectedImage(); - Actor& backgroundImage = GetBackgroundImage(); - Actor& disabledImage = GetDisabledImage(); - Actor& disabledBackgroundImage = GetDisabledBackgroundImage(); - Actor& fadeOutButtonImage = GetFadeOutButtonImage(); + StopTransitionAnimation(); +} - switch( mPaintState ) - { - case UnselectedState: +void PushButton::OnControlSizeSet( const Vector3& targetSize ) +{ + if( targetSize != mSize ) { - if( disabled ) - { - StopFadeOutAnimation(); - FadeOutImage( Background, backgroundImage ); - FadeOutImage( Foreground, buttonImage ); - FadeInImage( disabledBackgroundImage, 0.0f, 0 ); - FadeInImage( disabledImage, 0.0f, 0 ); - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage ) - { - mPaintState = UnselectedDisabledTransition; - } - else - { - mPaintState = DisabledUnselectedState; - } - } - break; - } - case SelectedState: - { - if( disabled ) - { - StopFadeOutAnimation(); - FadeOutImage( Background, backgroundImage ); - FadeOutImage( Foreground, selectedImage ); - FadeInImage( disabledBackgroundImage, 0.0f, 0 ); - FadeInImage( disabledImage, 0.0f, 0 ); - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage ) - { - mPaintState = SelectedDisabledTransition; - } - else - { - mPaintState = DisabledSelectedState; - } - } - break; - } - case DisabledUnselectedState: - { - if( !disabled ) - { - StopFadeOutAnimation(); - FadeOutImage( Background, disabledBackgroundImage ); - FadeOutImage( Foreground, disabledImage ); - FadeInImage( backgroundImage, 0.0f, 0 ); - FadeInImage( buttonImage, 0.0f, 0 ); - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage ) - { - mPaintState = DisabledUnselectedTransition; - } - else - { - mPaintState = UnselectedState; - } - } - break; - } - case DisabledSelectedState: - { - if( !disabled ) - { - StopFadeOutAnimation(); - FadeOutImage( Background, disabledBackgroundImage ); - FadeOutImage( Foreground, disabledImage ); - FadeInImage( backgroundImage, 0.0f, 0 ); - FadeInImage( selectedImage, 0.0f, 0 ); - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage ) - { - mPaintState = DisabledSelectedTransition; - } - else - { - mPaintState = SelectedState; - } - } - 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, 0.0f, 0 ); - FadeInImage( disabledBackgroundImage, 0.0f, 0 ); + mSize = targetSize; - StartFadeOutAnimation(); - StartFadeInAnimation(); + Actor& label = GetLabel(); - if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage ) - { - mPaintState = SelectedDisabledTransition; - } - else - { - mPaintState = DisabledSelectedState; - } - } - break; - } - case SelectedUnselectedTransition: - { - if( disabled ) + if( label ) { - float opacity = 1.f; - if( fadeOutButtonImage ) - { - opacity = fadeOutButtonImage.GetCurrentOpacity(); - } - StopFadeOutAnimation(); - StopFadeInAnimation(); - - FadeOutImage( Foreground, buttonImage, 1.f - opacity ); - FadeOutImage( Background, backgroundImage ); - - FadeInImage( disabledImage, 0.0f, 0); - FadeInImage( disabledBackgroundImage, 0.0f, 0 ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage ) - { - mPaintState = UnselectedDisabledTransition; - } - else - { - mPaintState = DisabledUnselectedState; - } + label.SetSize( mSize ); } - 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, 0 ); - FadeInImage( backgroundImage, opacity, 0 ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); +} - if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage ) - { - mPaintState = DisabledUnselectedTransition; - } - else - { - mPaintState = UnselectedState; - } - } - break; - } - case DisabledUnselectedTransition: +void PushButton::StartTransitionAnimation() +{ + if( mTransitionAnimation ) { - if( disabled ) - { - 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, 0 ); - FadeInImage( disabledBackgroundImage, opacity, 0 ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage ) - { - mPaintState = UnselectedDisabledTransition; - } - else - { - mPaintState = DisabledUnselectedState; - } - } - break; + mTransitionAnimation.FinishedSignal().Connect( this, &PushButton::TransitionAnimationFinished ); + mTransitionAnimation.Play(); } - case SelectedDisabledTransition: - { - 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( selectedImage, opacity, 0 ); - FadeInImage( backgroundImage, opacity, 0 ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); +} - if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage ) - { - mPaintState = DisabledSelectedTransition; - } - else - { - mPaintState = SelectedState; - } - } - break; - } - case DisabledSelectedTransition: +void PushButton::StopTransitionAnimation( bool remove ) +{ + if( mTransitionAnimation ) { - if( disabled ) - { - float opacity = 1.f; - if( fadeOutButtonImage ) - { - opacity = fadeOutButtonImage.GetCurrentOpacity(); - } - StopFadeOutAnimation( false ); - StopFadeInAnimation(); - - FadeOutImage( Foreground, selectedImage, 1.f - opacity ); - FadeOutImage( Background, backgroundImage, 1.f - opacity ); - FadeInImage( disabledImage, opacity, 0 ); - FadeInImage( disabledBackgroundImage, opacity, 0 ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); - - if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage ) - { - mPaintState = SelectedDisabledTransition; - } - else - { - mPaintState = DisabledSelectedState; - } - } - break; + mTransitionAnimation.Clear(); + mTransitionAnimation.Reset(); } - default: - break; + + if( remove ) + { + UpdatePaintTransitionState(); } } -void PushButton::OnPressed() +void PushButton::FadeInImage( Actor& image, float opacity, Vector3 scale ) { - Actor& selectedImage = GetSelectedImage(); - Actor& buttonImage = GetButtonImage(); - Actor& fadeOutButtonImage = GetFadeOutButtonImage(); - - switch( mPaintState ) + if( image ) { - case UnselectedState: - { - StopFadeOutAnimation(); - FadeOutImage( Foreground, buttonImage ); - FadeInImage( selectedImage, 0.0f, 0 ); - StartFadeOutAnimation(); - StartFadeInAnimation(); + image.SetOpacity( opacity ); + image.SetScale( scale ); - if( buttonImage || selectedImage ) - { - mPaintState = UnselectedSelectedTransition; - } - else - { - mPaintState = SelectedState; - } - break; - } - case UnselectedSelectedTransition: + if( !mTransitionAnimation ) { - if( !IsAutoRepeating() ) - { - mPaintState = SelectedUnselectedTransition; - } - break; + mTransitionAnimation = Dali::Animation::New( GetAnimationTime() ); } - case SelectedUnselectedTransition: - { - float opacity = 1.f; - if( fadeOutButtonImage ) - { - opacity = fadeOutButtonImage.GetCurrentOpacity(); - } - StopFadeOutAnimation( false ); - StopFadeInAnimation(); - - FadeOutImage( Foreground, buttonImage, 1.f - opacity ); - FadeInImage( selectedImage, opacity, 0 ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); - if( buttonImage || selectedImage ) - { - mPaintState = UnselectedSelectedTransition; - } - else - { - mPaintState = SelectedState; - } - break; - } - default: - break; + mTransitionAnimation.AnimateTo( Property( image, Actor::Property::COLOR_ALPHA ), 1.f ); } } -void PushButton::OnReleased() +void PushButton::FadeOutImage( Actor& image, float opacity, Vector3 scale ) { - Actor& selectedImage = GetSelectedImage(); - Actor& buttonImage = GetButtonImage(); - Actor& fadeOutButtonImage = GetFadeOutButtonImage(); - - switch( mPaintState ) + if( image ) { - case SelectedState: - { - StopFadeOutAnimation(); - FadeOutImage( Foreground, selectedImage ); - FadeInImage( buttonImage, 0.0f, 0 ); - 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, 0 ); - - StartFadeOutAnimation(); - StartFadeInAnimation(); + image.SetOpacity( opacity ); + image.SetScale( scale ); - if( buttonImage || selectedImage ) - { - mPaintState = SelectedUnselectedTransition; - } - else - { - mPaintState = UnselectedState; - } - break; - } - default: + if( !mTransitionAnimation ) { - break; + mTransitionAnimation = Dali::Animation::New( GetAnimationTime() ); } + + mTransitionAnimation.AnimateTo( Property( image, Actor::Property::COLOR_ALPHA ), 0.f ); } } -void PushButton::OnClicked() +void PushButton::TransitionAnimationFinished( Dali::Animation& source ) { - OnReleased(); -} - -void PushButton::OnControlSizeSet( const Vector3& targetSize ) -{ - if( targetSize != mSize ) - { - mSize = targetSize; - - Actor& label = GetLabel(); - - if( label ) - { - label.SetSize( mSize ); - } - } + StopTransitionAnimation(); } Vector3 PushButton::GetNaturalSize() { - Vector3 size = Control::GetNaturalSize(); - - const bool widthIsZero = EqualsZero( size.width ); - const bool heightIsZero = EqualsZero( size.height ); + Vector3 size; - if( widthIsZero || heightIsZero ) + // If label, test against it's size + Toolkit::TextLabel label = Toolkit::TextLabel::DownCast( GetLabel() ); + if( label ) { - // 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 = imageActor.GetNaturalSize(); - - if( widthIsZero ) - { - size.width = imageSize.width; - } - - if( heightIsZero ) - { - size.height = imageSize.height; - } - } - - ImageActor backgroundImageActor = FindImageActor( GetBackgroundImage() ); - if( backgroundImageActor && backgroundImageActor.GetStyle() != ImageActor::STYLE_NINE_PATCH ) - { - Vector3 imageSize = backgroundImageActor.GetNaturalSize(); - - if( widthIsZero ) - { - size.width = std::max( size.width, imageSize.width ); - } - - if( heightIsZero ) - { - size.height = std::max( size.height, imageSize.height ); - } - } + size.width = std::max( size.width, label.GetRelayoutSize( Dimension::WIDTH ) ); + size.height = std::max( size.height, label.GetRelayoutSize( Dimension::HEIGHT ) ); + } + else + { + // Check Image and Background image and use the largest size as the control's Natural size. + SizeOfActorIfLarger( GetButtonImage(), 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; -} + ActorContainer images; + images.reserve( 7 ); -void PushButton::AddToFadeInAnimation( const Actor& actor ) -{ - if( !mFadeInAnimation ) - { - mFadeInAnimation = Dali::Animation::New( GetAnimationTime() ); - } - - mFadeInAnimation.OpacityTo( actor, 1.f ); -} - -void PushButton::StartFadeInAnimation() -{ - if( mFadeInAnimation ) - { - mFadeInAnimation.FinishedSignal().Connect( this, &PushButton::FadeInAnimationFinished ); - mFadeInAnimation.Play(); - } -} + images.push_back( GetButtonImage() ); + images.push_back( GetSelectedImage() ); + images.push_back( GetSelectedBackgroundImage() ); + images.push_back( GetBackgroundImage() ); + images.push_back( GetDisabledImage() ); + images.push_back( GetDisabledSelectedImage() ); + images.push_back( GetDisabledBackgroundImage() ); -void PushButton::StopFadeInAnimation() -{ - if( mFadeInAnimation ) - { - mFadeInAnimation.Clear(); - mFadeInAnimation.Reset(); - } -} + Actor label = GetLabel(); -void PushButton::AddToFadeOutAnimation( const Actor& actor ) -{ - if( !mFadeOutAnimation ) + for( unsigned int i = 0; i < Dimension::DIMENSION_COUNT; ++i ) { - mFadeOutAnimation = Dali::Animation::New( GetAnimationTime() ); + ConfigureSizeNegotiationDimension( static_cast< Dimension::Type >( 1 << i ), images, label ); } - mFadeOutAnimation.OpacityTo( actor, 0.f ); -} - -void PushButton::StartFadeOutAnimation() -{ - if( mFadeOutAnimation ) + if( label ) { - mFadeOutAnimation.FinishedSignal().Connect( this, &PushButton::FadeOutAnimationFinished ); - mFadeOutAnimation.Play(); + label.SetPadding( Padding( TEXT_PADDING, TEXT_PADDING, TEXT_PADDING, TEXT_PADDING) ); } } -void PushButton::StopFadeOutAnimation( bool remove ) +void PushButton::ConfigureSizeNegotiationDimension( Dimension::Type dimension, const ActorContainer& images, Actor& label ) { - if( mFadeOutAnimation ) - { - mFadeOutAnimation.Clear(); - mFadeOutAnimation.Reset(); - } + ResizePolicy::Type imageResizePolicy = ResizePolicy::FILL_TO_PARENT; + ResizePolicy::Type labelResizePolicy = ResizePolicy::FILL_TO_PARENT; - if( remove ) + switch( Self().GetResizePolicy( dimension ) ) { - Actor& fadeOutButtonImage = GetFadeOutButtonImage(); - Actor& fadeOutBackgroundImage = GetFadeOutBackgroundImage(); - - if( fadeOutButtonImage && fadeOutButtonImage.GetParent() ) + case ResizePolicy::FIT_TO_CHILDREN: { - fadeOutButtonImage.GetParent().Remove( fadeOutButtonImage ); + imageResizePolicy = labelResizePolicy = ResizePolicy::USE_NATURAL_SIZE; + break; } - - if( fadeOutBackgroundImage && fadeOutBackgroundImage.GetParent() ) + case ResizePolicy::USE_NATURAL_SIZE: { - fadeOutBackgroundImage.GetParent().Remove( fadeOutBackgroundImage ); - } - - fadeOutButtonImage.Reset(); - fadeOutBackgroundImage.Reset(); - } -} - -void PushButton::FadeInImage( Actor& image, float opacity, int priority ) -{ - if( image ) - { - image.SetOpacity( opacity ); - if( !image.GetParent() ) - { - if( priority > -1 ) + if( label ) { - Self().Insert( priority, image ); + labelResizePolicy = ResizePolicy::USE_NATURAL_SIZE; } else { - Self().Add( image ); + imageResizePolicy = ResizePolicy::USE_NATURAL_SIZE; } - } - - AddToFadeInAnimation( image ); - } -} - -void PushButton::FadeOutImage( ImageLayer layer, Actor& image, float opacity ) -{ - if( image ) - { - Actor& fadeOutButtonImage = GetFadeOutButtonImage(); - Actor& fadeOutBackgroundImage = GetFadeOutBackgroundImage(); - - Actor& actorLayer = ( ( Background == layer ) ? fadeOutBackgroundImage : fadeOutButtonImage ); - - actorLayer = image; - actorLayer.SetOpacity( opacity ); - - AddToFadeOutAnimation( actorLayer ); - } -} - -void PushButton::FadeOutAnimationFinished( Dali::Animation& source ) -{ - switch( mPaintState ) - { - 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: - { - mPaintState = SelectedState; break; } default: @@ -1238,50 +695,19 @@ void PushButton::FadeOutAnimationFinished( Dali::Animation& source ) } } - StopFadeOutAnimation(); -} + if( label ) + { + label.SetResizePolicy( labelResizePolicy, dimension ); + } -void PushButton::FadeInAnimationFinished( Dali::Animation& source ) -{ - switch( mPaintState ) + for( ActorConstIter it = images.begin(), itEnd = images.end(); it != itEnd; ++it ) { - case UnselectedSelectedTransition: - { - mPaintState = SelectedState; - break; - } - case SelectedUnselectedTransition: + Actor actor = *it; + if( actor ) { - mPaintState = UnselectedState; - break; - } - case UnselectedDisabledTransition: - { - mPaintState = DisabledUnselectedState; - break; - } - case DisabledUnselectedTransition: - { - mPaintState = UnselectedState; - break; - } - case SelectedDisabledTransition: - { - mPaintState = DisabledSelectedState; - break; - } - case DisabledSelectedTransition: - { - mPaintState = SelectedState; - break; - } - default: - { - break; + actor.SetResizePolicy( imageResizePolicy, dimension ); } } - - StopFadeInAnimation(); } } // namespace Internal