X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fpush-button-impl.cpp;h=a63b861fdd7a9643dcf389ece4f6e96c0dce8172;hb=9c1f4310db72879676b5aca2875fbf67b97a4b0a;hp=a2cb95da4d153954472ac9c79c739866fa73d8dc;hpb=6e824d3bfb11cab305d0d8375b202076d59222b0;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 a2cb95d..2906245 100644 --- a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,69 +19,56 @@ #include "push-button-impl.h" // EXTERNAL INCLUDES -#include +#include +#include +#include #include // INTERNAL INCLUDES -#include +#include +#include +#include +#include + +#if defined(DEBUG_ENABLED) +extern Debug::Filter* gLogButtonFilter; +#endif namespace Dali { - namespace Toolkit { - 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, "labelPadding", STRING, LABEL_PADDING) +DALI_PROPERTY_REGISTRATION(Toolkit, PushButton, "iconPadding", STRING, ICON_PADDING) -/** - * Find the first image actor in the actor hierarchy - */ -ImageActor FindImageActor( Actor root ) -{ - ImageActor imageActor = ImageActor::DownCast( root ); - if( !imageActor && root ) - { - for( unsigned int i = 0, numChildren = root.GetChildCount(); i < numChildren; ++i ) - { - ImageActor childImageActor = FindImageActor( root.GetChildAt( i ) ); - if( childImageActor ) - { - return childImageActor; - } - } - } +DALI_TYPE_REGISTRATION_END() - return imageActor; -} +} // unnamed namespace +namespace +{ } // unnamed namespace Dali::Toolkit::PushButton PushButton::New() { // Create the implementation, temporarily owned on stack - IntrusivePtr< PushButton > internalPushButton = new PushButton(); + IntrusivePtr internalPushButton = new PushButton(); // Pass ownership to CustomActor - Dali::Toolkit::PushButton pushButton( *internalPushButton ); + Dali::Toolkit::PushButton pushButton(*internalPushButton); // Second-phase init of the implementation // This can only be done after the CustomActor connection has been made... @@ -92,582 +79,143 @@ 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 ); + self.SetProperty(Actor::Property::LEAVE_REQUIRED, true); - // Set resize policy to natural size so that buttons will resize to background images - self.SetResizePolicy( USE_NATURAL_SIZE, ALL_DIMENSIONS ); + DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) { + return std::make_unique(actor, Dali::Accessibility::Role::PUSH_BUTTON); + }); } -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.SetSize( mSize ); - } -} - -void PushButton::OnButtonImageSet() -{ - Actor& buttonImage = GetButtonImage(); - - buttonImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); - - buttonImage.RelayoutRequestTree(); - - RelayoutRequest(); -} - -void PushButton::OnSelectedImageSet() -{ - Actor& selectedImage = GetSelectedImage(); - - selectedImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); - - selectedImage.RelayoutRequestTree(); - - RelayoutRequest(); -} - -void PushButton::OnBackgroundImageSet() -{ - Actor& backgroundImage = GetBackgroundImage(); - - backgroundImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); - - backgroundImage.RelayoutRequestTree(); - - RelayoutRequest(); -} - -void PushButton::OnSelectedBackgroundImageSet() -{ - Actor& selectedBackgroundImage = GetSelectedBackgroundImage(); - - selectedBackgroundImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); -} - -void PushButton::OnDisabledImageSet() -{ - Actor& disabledImage = GetDisabledImage(); - - disabledImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); - - disabledImage.RelayoutRequestTree(); - - RelayoutRequest(); -} - -void PushButton::OnDisabledBackgroundImageSet() -{ - Actor& disabledBackgroundImage = GetDisabledBackgroundImage(); - - disabledBackgroundImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); - - disabledBackgroundImage.RelayoutRequestTree(); - - RelayoutRequest(); -} - -bool PushButton::OnSelected() -{ - Actor& buttonImage = GetButtonImage(); - Actor& selectedImage = GetSelectedImage(); - Actor& selectedBackgroundImage = GetSelectedBackgroundImage(); - - PaintState paintState = GetPaintState(); - - switch( paintState ) - { - case UnselectedState: - { - FadeOutImage( buttonImage ); - FadeInImage( selectedBackgroundImage ); - FadeInImage( selectedImage ); - StartTransitionAnimation(); - break; - } - case SelectedState: - { - FadeOutImage( selectedBackgroundImage ); - FadeOutImage( selectedImage ); - FadeInImage( buttonImage ); - StartTransitionAnimation(); - break; - } - case UnselectedSelectedTransition: + case RIGHT: { - 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(); + labelAlignment = Button::BEGIN; break; } - case DisabledUnselectedTransition: + case TOP: { - StopTransitionAnimation(); - FadeOutImage( buttonImage ); - FadeInImage( selectedBackgroundImage ); - FadeInImage( selectedImage ); - StartTransitionAnimation(); + labelAlignment = Button::BOTTOM; break; } - case DisabledSelectedTransition: + case BOTTOM: { - StopTransitionAnimation(); - FadeOutImage( selectedBackgroundImage ); - FadeOutImage( selectedImage ); - FadeInImage( buttonImage ); - StartTransitionAnimation(); + labelAlignment = Button::TOP; break; } + case LEFT: default: - { + labelAlignment = Button::END; break; - } - } - - if( mTransitionAnimation ) - { - return true; } - 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(); - } - - StopTransitionAnimation(); - FadeOutImage( backgroundImage ); - FadeOutImage( selectedBackgroundImage, opacity ); - FadeOutImage( selectedImage, opacity ); - FadeInImage( disabledBackgroundImage ); - FadeInImage( disabledSelectedImage ); - StartTransitionAnimation(); - break; - } - case SelectedUnselectedTransition: - { - float opacity = 1.f; - if( buttonImage ) - { - opacity = buttonImage.GetCurrentOpacity(); - } - - StopTransitionAnimation(); - FadeOutImage( backgroundImage ); - FadeOutImage( buttonImage, opacity ); - FadeInImage( disabledBackgroundImage ); - FadeInImage( disabledImage ); - StartTransitionAnimation(); - break; - } - case UnselectedDisabledTransition: - { - float opacity = 1.f; - if( disabledImage ) - { - opacity = disabledImage.GetCurrentOpacity(); - } + PushButton& pushButtonImpl(GetImplementation(pushButton)); - 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 ) - { - opacity = buttonImage.GetCurrentOpacity(); - } + // Properties remain here for Tizen 3.0 legacy requirements. Are now in Button base class - StopTransitionAnimation( false ); - FadeOutImage( backgroundImage, opacity ); - FadeOutImage( buttonImage, opacity ); - FadeInImage( disabledBackgroundImage, 1.f - opacity ); - FadeInImage( disabledImage, 1.f - opacity ); - StartTransitionAnimation(); - break; - } - case SelectedDisabledTransition: + switch(propertyIndex) { - float opacity = 1.f; - if( disabledSelectedImage ) + case Toolkit::PushButton::Property::LABEL_PADDING: { - opacity = disabledSelectedImage.GetCurrentOpacity(); + Vector4 padding(value.Get()); + 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()); + 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(); - - PaintState paintState = GetPaintState(); - - switch( paintState ) - { - case UnselectedState: - { - FadeOutImage( buttonImage ); - FadeInImage( selectedBackgroundImage ); - FadeInImage( selectedImage ); - StartTransitionAnimation(); - break; - } - case SelectedUnselectedTransition: - { - float opacity = 1.f; - if( buttonImage ) - { - opacity = buttonImage.GetCurrentOpacity(); - } + Property::Value value; - 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 ) - { - opacity = buttonImage.GetCurrentOpacity(); - } - - StopTransitionAnimation(); - FadeOutImage( buttonImage, opacity ); - FadeInImage( selectedBackgroundImage ); - FadeInImage( selectedImage ); - StartTransitionAnimation(); - break; - } - default: - break; - } + Toolkit::PushButton pushButton = Toolkit::PushButton::DownCast(Dali::BaseHandle(object)); - if( mTransitionAnimation ) + if(pushButton) { - return true; - } - - return false; -} + PushButton& pushButtonImpl(GetImplementation(pushButton)); -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: + switch(propertyIndex) { - 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; } - - 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::ICON_PADDING: { - opacity = selectedImage.GetCurrentOpacity(); + 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; + return value; } -void PushButton::StopAllAnimations() +Dali::Accessibility::States PushButton::PushButtonAccessible::CalculateStates() { - StopTransitionAnimation(); + auto state = Button::ButtonAccessible::CalculateStates(); + auto self = Toolkit::Button::DownCast(Self()); + state[Dali::Accessibility::State::PRESSED] = self.GetProperty(Toolkit::Button::Property::SELECTED); + return state; } -void PushButton::OnControlSizeSet( const Vector3& targetSize ) +void PushButton::OnStateChange(State newState) { - if( targetSize != mSize ) + // TODO: replace it with OnPropertySet hook once Button::Property::SELECTED will be consistently used + if(Dali::Accessibility::IsUp() && (Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor() == Self()) + && (newState == SELECTED_STATE || newState == UNSELECTED_STATE)) { - mSize = targetSize; - - Actor& label = GetLabel(); + Dali::Accessibility::Accessible::Get(Self())->EmitStateChanged(Dali::Accessibility::State::PRESSED, newState == SELECTED_STATE ? 1 : 0, 0); - if( label ) + if(Self().GetProperty(Toolkit::Button::Property::TOGGLABLE)) { - label.SetSize( mSize ); + Dali::Accessibility::Accessible::Get(Self())->EmitStateChanged(Dali::Accessibility::State::CHECKED, newState == SELECTED_STATE ? 1 : 0, 0); } } } -Vector3 PushButton::GetNaturalSize() -{ - Vector3 size; - - // If background and background not scale9 try get size from that - ImageActor imageActor = FindImageActor( GetButtonImage() ); - if( imageActor && imageActor.GetStyle() != ImageActor::STYLE_NINE_PATCH ) - { - size.width = imageActor.GetRelayoutSize( WIDTH ); - size.height = imageActor.GetRelayoutSize( HEIGHT ); - } - - ImageActor backgroundImageActor = FindImageActor( GetBackgroundImage() ); - if( backgroundImageActor && backgroundImageActor.GetStyle() != ImageActor::STYLE_NINE_PATCH ) - { - size.width = std::max( size.width, backgroundImageActor.GetRelayoutSize( WIDTH ) ); - size.height = std::max( size.height, backgroundImageActor.GetRelayoutSize( HEIGHT ) ); - } - - // If label, test against it's size - Toolkit::TextView textView = Toolkit::TextView::DownCast( GetLabel() ); - if( textView ) - { - Vector3 textViewSize = textView.GetNaturalSize(); - - size.width = std::max( size.width, textViewSize.width + TEXT_PADDING * 2.0f ); - size.height = std::max( size.height, textViewSize.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(); -} - } // namespace Internal } // namespace Toolkit