X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fcheck-box-button-impl.cpp;h=103992f1a7995640cc269c7123ddb66c0127b638;hp=44d62a51a7a5c5d99af5ec0ebddf0b4ff064da70;hb=f546dd5d83a968e573f8f053a01ce43df32c71a0;hpb=4b3b7f4169b809c086e09323960271f187e3558a diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp b/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp index 44d62a5..103992f 100644 --- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/check-box-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,13 +19,18 @@ #include "check-box-button-impl.h" // EXTERNAL INCLUDES +#include #include -#include //INTERNAL INCLUDES -#include #include +#include #include +#include + +#if defined(DEBUG_ENABLED) + extern Debug::Filter* gLogButtonFilter; +#endif namespace Dali { @@ -39,9 +44,6 @@ namespace Internal namespace { -const float DISTANCE_BETWEEN_IMAGE_AND_LABEL( 5.0f ); -const float ANIMATION_TIME( 0.26f ); // EFL checkbox tick time - BaseHandle Create() { return Toolkit::CheckBoxButton::New(); @@ -49,10 +51,8 @@ BaseHandle Create() TypeRegistration mType( typeid(Toolkit::CheckBoxButton), typeid(Toolkit::Button), Create ); -const char* const UNSELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "checkbox-unselected.png"; -const char* const SELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "checkbox-selected.png"; -const char* const DISABLED_UNSELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "checkbox-unselected-disabled.png"; -const char* const DISABLED_SELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "checkbox-selected-diabled.png"; + + } Dali::Toolkit::CheckBoxButton CheckBoxButton::New() @@ -74,164 +74,39 @@ CheckBoxButton::CheckBoxButton() : Button() { SetTogglableButton( true ); - - SetAnimationTime( ANIMATION_TIME ); } CheckBoxButton::~CheckBoxButton() { } -void CheckBoxButton::SetTickUVEffect() +void CheckBoxButton::OnInitialize() { - Toolkit::ImageView imageView = Toolkit::ImageView::DownCast( mSelectedImage ); - if( imageView ) - { - imageView.RegisterProperty( "uTextureRect", Vector4(0.f, 0.f, 1.f, 1.f ) ); - imageView.RegisterProperty( "uTopLeft", Vector2::ZERO ); + Button::OnInitialize(); - Property::Map shaderMap = CreateImageRegionEffect(); - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, shaderMap ); - - GetImpl( imageView ).SetDepthIndex( DECORATION_DEPTH_INDEX ); - } + DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor ) { + return std::unique_ptr< Dali::Accessibility::Accessible >( + new AccessibleImpl( actor, Dali::Accessibility::Role::CHECK_BOX ) ); + } ); } -void CheckBoxButton::OnButtonInitialize() +Dali::Accessibility::States CheckBoxButton::AccessibleImpl::CalculateStates() { - // Wrap around all children - Self().SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); - - SetUnselectedImage( UNSELECTED_BUTTON_IMAGE_DIR ); - SetSelectedImage( SELECTED_BUTTON_IMAGE_DIR ); - SetDisabledImage( DISABLED_UNSELECTED_BUTTON_IMAGE_DIR ); - SetDisabledSelectedImage( DISABLED_SELECTED_BUTTON_IMAGE_DIR ); - - mSelectedImage = GetSelectedImage(); - SetTickUVEffect(); -} - -void CheckBoxButton::OnLabelSet( bool noPadding ) -{ - Actor& label = GetLabelActor(); - - if( label ) - { - label.SetParentOrigin( ParentOrigin::CENTER_LEFT ); - label.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); - - if( IsDisabled() && GetDisabledBackgroundImage() ) - { - label.SetX( GetDisabledBackgroundImage().GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL ); - } - else if ( GetBackgroundImage() ) - { - label.SetX( GetBackgroundImage().GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL ); - } - else if( IsSelected() && GetSelectedImage()) - { - label.SetX( GetSelectedImage().GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL ); - } - else if( GetUnselectedImage() ) - { - label.SetX( GetUnselectedImage().GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL ); - } - else - { - label.SetX( DISTANCE_BETWEEN_IMAGE_AND_LABEL ); - } - } -} - -void CheckBoxButton::OnDisabled() -{ - Actor& backgroundImage = GetBackgroundImage(); - Actor& disabledBackgroundImage = GetDisabledBackgroundImage(); - - Actor& label = GetLabelActor(); - if( label ) - { - if( IsDisabled() && disabledBackgroundImage ) - { - label.SetX( disabledBackgroundImage.GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL ); - } - else if( backgroundImage ) - { - label.SetX( backgroundImage.GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL ); - } - else if( IsSelected() && GetSelectedImage()) - { - label.SetX( GetSelectedImage().GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL ); - } - else if( GetUnselectedImage() ) - { - label.SetX( GetUnselectedImage().GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL ); - } - else - { - label.SetX( DISTANCE_BETWEEN_IMAGE_AND_LABEL ); - } - } -} - -void CheckBoxButton::PrepareForTranstionIn( Actor actor ) -{ - Actor& selectedImage = GetSelectedImage(); - if( actor == selectedImage ) - { - actor.SetScale( Vector3( 0.0f, 1.0f, 1.0f ) ); - actor.RegisterProperty( "uBottomRight", Vector2( 0.0f, 1.0f ) ); - - if( mSelectedImage != selectedImage ) - { - mSelectedImage = selectedImage; - SetTickUVEffect(); - } - } -} - -void CheckBoxButton::PrepareForTranstionOut( Actor actor ) -{ - Actor& selectedImage = GetSelectedImage(); - if( actor == selectedImage ) - { - actor.SetScale( Vector3::ONE ); - actor.RegisterProperty( "uBottomRight", Vector2::ONE ); - - if( mSelectedImage != selectedImage ) - { - mSelectedImage = selectedImage; - SetTickUVEffect(); - } - } + auto tmp = Button::AccessibleImpl::CalculateStates(); + auto slf = Toolkit::Button::DownCast( self ); + if( slf.GetProperty( Toolkit::Button::Property::SELECTED ) ) + tmp[Dali::Accessibility::State::CHECKED] = true; + return tmp; } -void CheckBoxButton::OnTransitionIn( Actor actor ) +void CheckBoxButton::OnStateChange( State newState ) { - Actor& selectedImage = GetSelectedImage(); - if( actor && actor == selectedImage ) + // TODO: replace it with OnPropertySet hook once Button::Property::SELECTED will be consistently used + if (Dali::Accessibility::IsUp() && (newState == SELECTED_STATE || newState == UNSELECTED_STATE)) { - if( GetPaintState() == UnselectedState ) - { - Dali::Animation transitionAnimation = GetTransitionAnimation(); - if( transitionAnimation ) - { - // UV anim - transitionAnimation.AnimateTo( Property( actor, "uBottomRight" ), Vector2::ONE ); - - // Actor size anim - transitionAnimation.AnimateTo( Property( actor, Actor::Property::SCALE_X ), 1.0f ); - } - } - else - { - //explicitly end the swipe animation - actor.SetScale( Vector3::ONE ); - if( mSelectedImage == selectedImage ) - { - actor.RegisterProperty( "uBottomRight", Vector2::ONE ); - } - } + Dali::Accessibility::Accessible::Get(Self())->EmitStateChanged( + Dali::Accessibility::State::CHECKED, newState == SELECTED_STATE ? 1 : 0, 0 + ); } }