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=e77bd301e69afb638dd5afd3965b73015b1f8f9f;hp=1ee6b92152fde435c873f6383894d3f25044f47f;hb=f546dd5d83a968e573f8f053a01ce43df32c71a0;hpb=efc136204e9a4460a7a2421e673c873e23974a80 diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp index 1ee6b92..e77bd30 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) 2020 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,12 +19,20 @@ #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 { @@ -38,41 +46,25 @@ 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 + +DALI_TYPE_REGISTRATION_BEGIN( Toolkit::PushButton, Toolkit::Button, Create ) + +DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "labelPadding", STRING, LABEL_PADDING ) +DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "iconPadding", STRING, ICON_PADDING ) -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"; +DALI_TYPE_REGISTRATION_END() } // unnamed namespace namespace { -/** - * 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 - */ -void SizeOfActorIfLarger( Actor root, Vector3& size ) -{ - 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 Dali::Toolkit::PushButton PushButton::New() @@ -92,255 +84,137 @@ 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 ); - - Image buttonImage = Dali::ResourceImage::New( UNSELECTED_BUTTON_IMAGE_DIR, ResourceImage::ON_DEMAND, ResourceImage::NEVER ); - Image selectedImage = Dali::ResourceImage::New( SELECTED_BUTTON_IMAGE_DIR, ResourceImage::ON_DEMAND, ResourceImage::NEVER ); - Image disabledImage = Dali::ResourceImage::New( DISABLED_UNSELECTED_BUTTON_IMAGE_DIR, ResourceImage::ON_DEMAND, ResourceImage::NEVER ); - Image disabledSelectedImage = Dali::ResourceImage::New( DISABLED_SELECTED_BUTTON_IMAGE_DIR, ResourceImage::ON_DEMAND, ResourceImage::NEVER ); + self.SetProperty( Actor::Property::LEAVE_REQUIRED, true ); - SetButtonImage( ImageActor::New( buttonImage ) ); - SetSelectedImage( ImageActor::New( selectedImage ) ); - SetDisabledImage( ImageActor::New( disabledImage ) ); - SetDisabledSelectedImage( ImageActor::New( disabledSelectedImage ) ); + DevelControl::SetAccessibilityConstructor( self, []( Dali::Actor actor ) { + return std::unique_ptr< Dali::Accessibility::Accessible >( + new AccessibleImpl( 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 ); - - 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 ); - } - - ConfigureSizeNegotiation(); - } -} - -void PushButton::OnButtonImageSet() -{ - ConfigureSizeNegotiation(); - RelayoutRequest(); -} - -void PushButton::OnSelectedImageSet() -{ - ConfigureSizeNegotiation(); - RelayoutRequest(); -} - -void PushButton::OnBackgroundImageSet() -{ - ConfigureSizeNegotiation(); - RelayoutRequest(); -} - -void PushButton::OnSelectedBackgroundImageSet() -{ - ConfigureSizeNegotiation(); - RelayoutRequest(); -} - -void PushButton::OnDisabledImageSet() -{ - ConfigureSizeNegotiation(); - RelayoutRequest(); -} - -void PushButton::OnDisabledSelectedImageSet() -{ - ConfigureSizeNegotiation(); - RelayoutRequest(); -} - -void PushButton::OnDisabledBackgroundImageSet() -{ - ConfigureSizeNegotiation(); - RelayoutRequest(); -} - -void PushButton::OnSizeSet( const Vector3& targetSize ) -{ - if( targetSize != mSize ) + case RIGHT: { - mSize = targetSize; - - Actor& label = GetLabel(); - - if( label ) - { - label.SetSize( mSize ); - } + labelAlignment = Button::BEGIN; + break; } -} - -void PushButton::PrepareForTranstionIn( Actor actor ) -{ - actor.SetOpacity( 0.0f ); -} - -void PushButton::PrepareForTranstionOut( Actor actor ) -{ - actor.SetOpacity( 1.0f ); -} - -void PushButton::OnTransitionIn( Actor actor ) -{ - FadeImageTo( actor, 1.f ); -} - -void PushButton::OnTransitionOut( Actor actor ) -{ - FadeImageTo( actor, 0.0f ); -} - -void PushButton::FadeImageTo( Actor actor, float opacity ) -{ - if( actor ) + case TOP: { - Dali::Animation transitionAnimation = GetTransitionAnimation(); - DALI_ASSERT_DEBUG( transitionAnimation ); - - if( transitionAnimation ) - { - transitionAnimation.AnimateTo( Property( actor, Actor::Property::COLOR_ALPHA ), opacity ); - } + labelAlignment = Button::BOTTOM; + break; } -} - -Vector3 PushButton::GetNaturalSize() -{ - Vector3 size; - - // If label, test against it's size - Toolkit::TextLabel label = Toolkit::TextLabel::DownCast( GetLabel() ); - if( label ) + case BOTTOM: { - size.width = std::max( size.width, label.GetRelayoutSize( Dimension::WIDTH ) ); - size.height = std::max( size.height, label.GetRelayoutSize( Dimension::HEIGHT ) ); + labelAlignment = Button::TOP; + break; } - else - { - // Check Image and Background image and use the largest size as the control's Natural size. - SizeOfActorIfLarger( GetButtonImage(), size ); - SizeOfActorIfLarger( GetBackgroundImage(), size ); + case LEFT: + default: + labelAlignment = Button::END; + break; } - return size; + Button::SetLabelAlignment( labelAlignment ); } -void PushButton::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ) +const PushButton::IconAlignment PushButton::GetIconAlignment() const { - ConfigureSizeNegotiation(); + return mIconAlignment; } -void PushButton::ConfigureSizeNegotiation() +void PushButton::SetProperty( BaseObject* object, Property::Index propertyIndex, const Property::Value& value ) { - std::vector< Actor > images; - images.reserve( 7 ); - - 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() ); - - Actor label = GetLabel(); - - for( unsigned int i = 0; i < Dimension::DIMENSION_COUNT; ++i ) - { - ConfigureSizeNegotiationDimension( static_cast< Dimension::Type >( 1 << i ), images, label ); - } + Toolkit::PushButton pushButton = Toolkit::PushButton::DownCast( Dali::BaseHandle( object ) ); - if( label ) + if ( pushButton ) { - Padding padding; + PushButton& pushButtonImpl( GetImplementation( pushButton ) ); - if( label.GetResizePolicy( Dimension::WIDTH ) == ResizePolicy::USE_NATURAL_SIZE ) - { - padding.left = TEXT_PADDING; - padding.right = TEXT_PADDING; - } + // Properties remain here for Tizen 3.0 legacy requirements. Are now in Button base class - if( label.GetResizePolicy( Dimension::HEIGHT ) == ResizePolicy::USE_NATURAL_SIZE ) + switch ( propertyIndex ) { - padding.top = TEXT_PADDING; - padding.bottom = TEXT_PADDING; + case Toolkit::PushButton::Property::LABEL_PADDING: + { + Vector4 padding ( value.Get< Vector4 >() ); + pushButtonImpl.Button::SetLabelPadding( Padding( padding.x, padding.y, padding.z, padding.w ) ); + break; + } + case Toolkit::PushButton::Property::ICON_PADDING: + { + Vector4 padding ( value.Get< Vector4 >() ); + pushButtonImpl.Button::SetForegroundPadding( Padding( padding.x, padding.y, padding.z, padding.w ) ); + break; + } } - - label.SetPadding( padding ); } } -void PushButton::ConfigureSizeNegotiationDimension( Dimension::Type dimension, const std::vector< Actor >& images, Actor& label ) +Property::Value PushButton::GetProperty( BaseObject* object, Property::Index propertyIndex ) { - ResizePolicy::Type imageResizePolicy = ResizePolicy::FILL_TO_PARENT; - ResizePolicy::Type labelResizePolicy = ResizePolicy::FILL_TO_PARENT; + Property::Value value; - switch( Self().GetResizePolicy( dimension ) ) + Toolkit::PushButton pushButton = Toolkit::PushButton::DownCast( Dali::BaseHandle( object ) ); + + if ( pushButton ) { - case ResizePolicy::FIT_TO_CHILDREN: - { - imageResizePolicy = labelResizePolicy = ResizePolicy::USE_NATURAL_SIZE; - break; - } - case ResizePolicy::USE_NATURAL_SIZE: + PushButton& pushButtonImpl( GetImplementation( pushButton ) ); + + switch ( propertyIndex ) { - if( label ) + case Toolkit::PushButton::Property::LABEL_PADDING: { - labelResizePolicy = ResizePolicy::USE_NATURAL_SIZE; + Padding padding = pushButtonImpl.Button::GetLabelPadding(); + value = Vector4( padding.x, padding.y, padding.top, padding.bottom); + break; } - else + case Toolkit::PushButton::Property::ICON_PADDING: { - imageResizePolicy = ResizePolicy::USE_NATURAL_SIZE; + Padding padding = pushButtonImpl.Button::GetForegroundPadding(); + value = Vector4( padding.x, padding.y, padding.top, padding.bottom); + break; } - break; - } - default: - { - break; } } - if( label ) - { - label.SetResizePolicy( labelResizePolicy, dimension ); - } + return value; +} - for( std::vector< Actor >::const_iterator it = images.begin(), itEnd = images.end(); it != itEnd; ++it ) +Dali::Accessibility::States PushButton::AccessibleImpl::CalculateStates() +{ + auto tmp = Button::AccessibleImpl::CalculateStates(); + auto slf = Toolkit::Button::DownCast( self ); + tmp[Dali::Accessibility::State::PRESSED] = slf.GetProperty( Toolkit::Button::Property::SELECTED ); + return tmp; +} + +void PushButton::OnStateChange( State newState ) +{ + // TODO: replace it with OnPropertySet hook once Button::Property::SELECTED will be consistently used + if (Dali::Accessibility::IsUp() && (newState == SELECTED_STATE || newState == UNSELECTED_STATE)) { - Actor actor = *it; - if( actor ) - { - actor.SetResizePolicy( imageResizePolicy, dimension ); - } + Dali::Accessibility::Accessible::Get(Self())->EmitStateChanged( + Dali::Accessibility::State::PRESSED, newState == SELECTED_STATE ? 1 : 0, 0 + ); } }