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=4e96f14551499d6d3ccc83cf0e87c5fd44eaa3ef;hp=cf34f85cc409078894308024b9f326d9e9ca20cf;hb=abbf60ed35112186269d2fe93b949eb8abd4283d;hpb=cd7d41bc8e0a0816da28401207091344fbbe0b2c diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp index cf34f85..4e96f14 100644 --- a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp @@ -19,11 +19,21 @@ #include "push-button-impl.h" // EXTERNAL INCLUDES -#include #include +#include +#include +#include +#include // INTERNAL INCLUDES +#include #include +#include +#include + +#if defined(DEBUG_ENABLED) + extern Debug::Filter* gLogButtonFilter; +#endif namespace Dali { @@ -37,35 +47,37 @@ namespace Internal namespace { -const float TEXT_PADDING = 12.0f; -const float ANIMATION_TIME( 0.2f ); - BaseHandle Create() { return Toolkit::PushButton::New(); } -TypeRegistration typeRegistration( typeid(Toolkit::PushButton), typeid(Toolkit::Button), Create ); +// Properties -} // unnamed namespace +DALI_TYPE_REGISTRATION_BEGIN( Toolkit::PushButton, Toolkit::Button, Create ) -namespace -{ +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() -/** - * 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 +/* + * Table to define Text-to-enum conversions for IconAlignment. */ -void SizeOfActorIfLarger( Actor root, Vector3& size ) +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] ); + +} // unnamed namespace + +namespace { - if ( root ) - { - // 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 ); - } -} } // unnamed namespace @@ -86,577 +98,148 @@ Dali::Toolkit::PushButton PushButton::New() PushButton::PushButton() : Button(), - mSize() + mIconAlignment( RIGHT ) { - SetAnimationTime( ANIMATION_TIME ); } PushButton::~PushButton() { } -void PushButton::OnButtonInitialize() +void PushButton::OnInitialize() { + Button::OnInitialize(); + // Push button requires the Leave event. Actor self = Self(); self.SetLeaveRequired( true ); - - // Set resize policy to natural size so that buttons will resize to background images - self.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); } -void PushButton::OnLabelSet() +void PushButton::SetIconAlignment( const PushButton::IconAlignment iconAlignment ) { - Actor& label = GetLabel(); - - if( label ) + mIconAlignment = iconAlignment; + Button::Align labelAlignment; + switch ( iconAlignment ) { - label.SetAnchorPoint( AnchorPoint::CENTER ); - label.SetParentOrigin( ParentOrigin::CENTER ); - label.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - - Toolkit::TextLabel textLabel = Toolkit::TextLabel::DownCast( label ); - if( textLabel ) - { - textLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); - textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); - textLabel.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, true ); - } + case RIGHT: + { + labelAlignment = Button::BEGIN; + break; } -} - -void PushButton::OnButtonImageSet() -{ - Actor& buttonImage = GetButtonImage(); - - buttonImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - - buttonImage.RelayoutRequestTree(); - - RelayoutRequest(); -} - -void PushButton::OnSelectedImageSet() -{ - Actor& selectedImage = GetSelectedImage(); - - selectedImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - - selectedImage.RelayoutRequestTree(); - - RelayoutRequest(); -} - -void PushButton::OnBackgroundImageSet() -{ - Actor& backgroundImage = GetBackgroundImage(); - - backgroundImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - - backgroundImage.RelayoutRequestTree(); - - RelayoutRequest(); -} - -void PushButton::OnSelectedBackgroundImageSet() -{ - Actor& selectedBackgroundImage = GetSelectedBackgroundImage(); - - selectedBackgroundImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); -} - -void PushButton::OnDisabledImageSet() -{ - Actor& disabledImage = GetDisabledImage(); - - disabledImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - - disabledImage.RelayoutRequestTree(); - - RelayoutRequest(); -} - -void PushButton::OnDisabledBackgroundImageSet() -{ - Actor& disabledBackgroundImage = GetDisabledBackgroundImage(); - - disabledBackgroundImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - - disabledBackgroundImage.RelayoutRequestTree(); - - RelayoutRequest(); -} - -bool PushButton::OnSelected() -{ - Actor& buttonImage = GetButtonImage(); - Actor& selectedImage = GetSelectedImage(); - Actor& selectedBackgroundImage = GetSelectedBackgroundImage(); - - PaintState paintState = GetPaintState(); - - switch( paintState ) + case TOP: { - case UnselectedState: - { - FadeOutImage( buttonImage ); - FadeInImage( selectedBackgroundImage ); - FadeInImage( selectedImage ); - StartTransitionAnimation(); - break; - } - case SelectedState: - { - FadeOutImage( selectedBackgroundImage ); - FadeOutImage( selectedImage ); - FadeInImage( buttonImage ); - StartTransitionAnimation(); - break; - } - case UnselectedSelectedTransition: - { - float opacity = 1.f; - if( selectedImage ) - { - opacity = selectedImage.GetCurrentOpacity(); - } - - 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(); - } - - 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 DisabledSelectedTransition: - { - StopTransitionAnimation(); - FadeOutImage( selectedBackgroundImage ); - FadeOutImage( selectedImage ); - FadeInImage( buttonImage ); - StartTransitionAnimation(); - break; - } - default: - { - break; - } + labelAlignment = Button::BOTTOM; + break; } - - if( mTransitionAnimation ) + case BOTTOM: { - return true; + labelAlignment = Button::TOP; + break; + } + case LEFT: + default: + labelAlignment = Button::END; + break; } - return false; + Button::SetLabelAlignment( labelAlignment ); } -bool PushButton::OnDisabled() +const PushButton::IconAlignment PushButton::GetIconAlignment() const { - Actor& buttonImage = GetButtonImage(); - Actor& selectedImage = GetSelectedImage(); - Actor& selectedBackgroundImage = GetSelectedBackgroundImage(); - Actor& backgroundImage = GetBackgroundImage(); - Actor& disabledImage = GetDisabledImage(); - Actor& disabledSelectedImage = GetDisabledSelectedImage(); - Actor& disabledBackgroundImage = GetDisabledBackgroundImage(); + return mIconAlignment; +} - PaintState paintState = GetPaintState(); +void PushButton::SetProperty( BaseObject* object, Property::Index propertyIndex, const Property::Value& value ) +{ + Toolkit::PushButton pushButton = Toolkit::PushButton::DownCast( Dali::BaseHandle( object ) ); - switch( paintState ) + if ( pushButton ) { - 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: - { - float opacity = 1.f; - if( selectedImage ) - { - opacity = selectedImage.GetCurrentOpacity(); - } + PushButton& pushButtonImpl( GetImplementation( pushButton ) ); - StopTransitionAnimation(); - FadeOutImage( backgroundImage ); - FadeOutImage( selectedBackgroundImage, opacity ); - FadeOutImage( selectedImage, opacity ); - FadeInImage( disabledBackgroundImage ); - FadeInImage( disabledSelectedImage ); - StartTransitionAnimation(); - break; - } - case SelectedUnselectedTransition: + // Properties remain here for Tizen 3.0 legacy requirements. Are now in Button base class + + switch ( propertyIndex ) { - float opacity = 1.f; - if( buttonImage ) + case Toolkit::PushButton::Property::UNSELECTED_ICON: { - opacity = buttonImage.GetCurrentOpacity(); + pushButtonImpl.CreateVisualsForComponent( Toolkit::Button::Property::UNSELECTED_VISUAL, value, DepthIndex::CONTENT ); + break; } - - StopTransitionAnimation(); - FadeOutImage( backgroundImage ); - FadeOutImage( buttonImage, opacity ); - FadeInImage( disabledBackgroundImage ); - FadeInImage( disabledImage ); - StartTransitionAnimation(); - break; - } - case UnselectedDisabledTransition: - { - float opacity = 1.f; - if( disabledImage ) + case Toolkit::PushButton::Property::SELECTED_ICON: { - opacity = disabledImage.GetCurrentOpacity(); + pushButtonImpl.CreateVisualsForComponent( Toolkit::Button::Property::SELECTED_VISUAL, value, DepthIndex::CONTENT ); + break; } - - StopTransitionAnimation( false ); - FadeOutImage( disabledBackgroundImage, opacity ); - FadeOutImage( disabledImage, opacity ); - FadeInImage( backgroundImage, 1.f - opacity ); - FadeInImage( buttonImage, 1.f - opacity ); - StartTransitionAnimation(); - break; - } - case DisabledUnselectedTransition: - { - float opacity = 1.f; - if( buttonImage ) + case Toolkit::PushButton::Property::ICON_ALIGNMENT: { - opacity = buttonImage.GetCurrentOpacity(); + IconAlignment iconAlignment; + if( Scripting::GetEnumeration< IconAlignment >( value.Get< std::string >().c_str(), IconAlignmentTable, IconAlignmentTableCount, iconAlignment ) ) + { + pushButtonImpl.SetIconAlignment( iconAlignment ); + } + break; } - - StopTransitionAnimation( false ); - FadeOutImage( backgroundImage, opacity ); - FadeOutImage( buttonImage, opacity ); - FadeInImage( disabledBackgroundImage, 1.f - opacity ); - FadeInImage( disabledImage, 1.f - opacity ); - StartTransitionAnimation(); - break; - } - case SelectedDisabledTransition: - { - float opacity = 1.f; - if( disabledSelectedImage ) + case Toolkit::PushButton::Property::LABEL_PADDING: { - opacity = disabledSelectedImage.GetCurrentOpacity(); + Vector4 padding ( value.Get< Vector4 >() ); + pushButtonImpl.Button::SetLabelPadding( Padding( padding.x, padding.y, padding.z, padding.w ) ); + break; } - - 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 DisabledSelectedTransition: - { - float opacity = 1.f; - if( selectedImage ) + case Toolkit::PushButton::Property::ICON_PADDING: { - opacity = selectedImage.GetCurrentOpacity(); + Vector4 padding ( value.Get< Vector4 >() ); + pushButtonImpl.Button::SetForegroundPadding( Padding( padding.x, padding.y, padding.z, padding.w ) ); + break; } - - StopTransitionAnimation( false ); - FadeOutImage( backgroundImage, opacity ); - FadeOutImage( selectedBackgroundImage, opacity ); - FadeOutImage( selectedImage, opacity ); - FadeInImage( disabledBackgroundImage, 1.f - opacity ); - FadeInImage( disabledSelectedImage, 1.f - opacity ); - StartTransitionAnimation(); - break; } } - - if( mTransitionAnimation ) - { - return true; - } - - return false; } -bool PushButton::OnPressed() +Property::Value PushButton::GetProperty( BaseObject* object, Property::Index propertyIndex ) { - Actor& buttonImage = GetButtonImage(); - Actor& selectedImage = GetSelectedImage(); - Actor& selectedBackgroundImage = GetSelectedBackgroundImage(); + Property::Value value; - PaintState paintState = GetPaintState(); + Toolkit::PushButton pushButton = Toolkit::PushButton::DownCast( Dali::BaseHandle( object ) ); - switch( paintState ) + if ( pushButton ) { - case UnselectedState: - { - FadeOutImage( buttonImage ); - FadeInImage( selectedBackgroundImage ); - FadeInImage( selectedImage ); - StartTransitionAnimation(); - break; - } - case SelectedUnselectedTransition: + PushButton& pushButtonImpl( GetImplementation( pushButton ) ); + + switch ( propertyIndex ) { - float opacity = 1.f; - if( buttonImage ) + case Toolkit::PushButton::Property::UNSELECTED_ICON: { - opacity = buttonImage.GetCurrentOpacity(); + //value = pushButtonImpl.GetIcon( UNSELECTED_DECORATION ); + break; } - - StopTransitionAnimation( false ); - FadeOutImage( buttonImage, opacity ); - FadeInImage( selectedBackgroundImage, 1.f - opacity ); - FadeInImage( selectedImage, 1.f - opacity ); - StartTransitionAnimation(); - break; - } - case DisabledUnselectedTransition: - { - float opacity = 1.f; - if( buttonImage ) + case Toolkit::PushButton::Property::SELECTED_ICON: { - opacity = buttonImage.GetCurrentOpacity(); + //value = pushButtonImpl.GetIcon( UNSELECTED_DECORATION ); + break; } - - StopTransitionAnimation(); - FadeOutImage( buttonImage, opacity ); - FadeInImage( selectedBackgroundImage ); - FadeInImage( selectedImage ); - StartTransitionAnimation(); - break; - } - default: - break; - } - - if( mTransitionAnimation ) - { - return true; - } - - return false; -} - -bool PushButton::OnReleased() -{ - Actor& buttonImage = GetButtonImage(); - Actor& selectedImage = GetSelectedImage(); - Actor& selectedBackgroundImage = GetSelectedBackgroundImage(); - - PaintState paintState = GetPaintState(); - - switch( paintState ) - { - case SelectedState: - { - FadeOutImage( selectedBackgroundImage ); - FadeOutImage( selectedImage ); - FadeInImage( buttonImage ); - StartTransitionAnimation(); - break; - } - case UnselectedSelectedTransition: - { - float opacity = 1.f; - if( selectedImage ) + case Toolkit::PushButton::Property::ICON_ALIGNMENT: { - opacity = selectedImage.GetCurrentOpacity(); + value = Scripting::GetLinearEnumerationName< IconAlignment >( pushButtonImpl.GetIconAlignment(), IconAlignmentTable, IconAlignmentTableCount ); + break; } - - StopTransitionAnimation( false ); - FadeOutImage( selectedBackgroundImage, opacity ); - FadeOutImage( selectedImage, opacity ); - FadeInImage( buttonImage, 1.f - opacity ); - StartTransitionAnimation(); - break; - } - case DisabledSelectedTransition: - { - float opacity = 1.f; - if( selectedImage ) + case Toolkit::PushButton::Property::LABEL_PADDING: { - opacity = selectedImage.GetCurrentOpacity(); + Padding padding = pushButtonImpl.Button::GetLabelPadding(); + value = Vector4( padding.x, padding.y, padding.top, padding.bottom); + break; + } + case Toolkit::PushButton::Property::ICON_PADDING: + { + Padding padding = pushButtonImpl.Button::GetForegroundPadding(); + value = Vector4( padding.x, padding.y, padding.top, padding.bottom); + break; } - - StopTransitionAnimation(); - FadeOutImage( selectedBackgroundImage, opacity ); - FadeOutImage( selectedImage, opacity ); - FadeInImage( buttonImage ); - StartTransitionAnimation(); - break; - } - default: - { - break; - } - } - - if( mTransitionAnimation ) - { - return true; - } - - return false; -} - -void PushButton::StopAllAnimations() -{ - StopTransitionAnimation(); -} - -void PushButton::OnControlSizeSet( const Vector3& targetSize ) -{ - if( targetSize != mSize ) - { - mSize = targetSize; - - Actor& label = GetLabel(); - - if( label ) - { - label.SetSize( mSize ); - } - } -} - -Vector3 PushButton::GetNaturalSize() -{ - Vector3 size; - - // Check Image and Background image and use the largest size as the control's Natural size. - SizeOfActorIfLarger( GetButtonImage(), size ); - SizeOfActorIfLarger( GetBackgroundImage(), size ); - - // If label, test against it's size - Toolkit::TextLabel label = Toolkit::TextLabel::DownCast( GetLabel() ); - if( label ) - { - Vector3 labelSize = label.GetNaturalSize(); - - size.width = std::max( size.width, labelSize.width + TEXT_PADDING * 2.0f ); - size.height = std::max( size.height, labelSize.height + TEXT_PADDING * 2.0f ); - } - - return size; -} - -void PushButton::StartTransitionAnimation() -{ - if( mTransitionAnimation ) - { - mTransitionAnimation.FinishedSignal().Connect( this, &PushButton::TransitionAnimationFinished ); - mTransitionAnimation.Play(); - } -} - -void PushButton::StopTransitionAnimation( bool remove ) -{ - if( mTransitionAnimation ) - { - mTransitionAnimation.Clear(); - mTransitionAnimation.Reset(); - } - - if( remove ) - { - UpdatePaintTransitionState(); - } -} - -void PushButton::FadeInImage( Actor& image, float opacity, Vector3 scale ) -{ - if( image ) - { - image.SetOpacity( opacity ); - image.SetScale( scale ); - - if( !mTransitionAnimation ) - { - mTransitionAnimation = Dali::Animation::New( GetAnimationTime() ); - } - - mTransitionAnimation.AnimateTo( Property( image, Actor::Property::COLOR_ALPHA ), 1.f ); - } -} - -void PushButton::FadeOutImage( Actor& image, float opacity, Vector3 scale ) -{ - if( image ) - { - image.SetOpacity( opacity ); - image.SetScale( scale ); - - if( !mTransitionAnimation ) - { - mTransitionAnimation = Dali::Animation::New( GetAnimationTime() ); } - - mTransitionAnimation.AnimateTo( Property( image, Actor::Property::COLOR_ALPHA ), 0.f ); } -} -void PushButton::TransitionAnimationFinished( Dali::Animation& source ) -{ - StopTransitionAnimation(); + return value; } } // namespace Internal