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=d09f7811aa23677ca964387e5d21f4965d4d49a5;hp=c5e078fe52f0ce1c6e04be6e9df83fa1cecbee70;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hpb=e2eda444afbe82e9591fe198eef339227f90a616 diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp index c5e078f..d09f781 100644 --- a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp @@ -1,32 +1,38 @@ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ // CLASS HEADER - #include "push-button-impl.h" // EXTERNAL INCLUDES - -#include +#include +#include +#include +#include // INTERNAL INCLUDES +#include +#include +#include +#include -#include "push-button-default-painter-impl.h" - -#include +#if defined(DEBUG_ENABLED) + extern Debug::Filter* gLogButtonFilter; +#endif namespace Dali { @@ -40,35 +46,26 @@ namespace Internal namespace { -using namespace Dali; - BaseHandle Create() { return Toolkit::PushButton::New(); } -TypeRegistration typeRegistration( typeid(Toolkit::PushButton), typeid(Toolkit::Button), Create ); +// Properties -SignalConnectorType signalConnector1( typeRegistration, Toolkit::PushButton::SIGNAL_TOGGLED , &PushButton::DoConnectSignal ); -SignalConnectorType signalConnector2( typeRegistration, Toolkit::PushButton::SIGNAL_PRESSED , &PushButton::DoConnectSignal ); -SignalConnectorType signalConnector3( typeRegistration, Toolkit::PushButton::SIGNAL_RELEASED, &PushButton::DoConnectSignal ); +DALI_TYPE_REGISTRATION_BEGIN( Toolkit::PushButton, Toolkit::Button, Create ) -TypeAction action1( typeRegistration, Toolkit::PushButton::ACTION_PUSH_BUTTON_CLICK, &PushButton::DoAction ); +DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "labelPadding", STRING, LABEL_PADDING ) +DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "iconPadding", STRING, ICON_PADDING ) -} +DALI_TYPE_REGISTRATION_END() +} // unnamed namespace namespace { - const unsigned int INITIAL_AUTOREPEATING_DELAY( 0.15f ); - const unsigned int NEXT_AUTOREPEATING_DELAY( 0.05f ); - // Helper function used to cast a ButtonPainter to PushButtonDefaultPainter - PushButtonDefaultPainterPtr GetPushButtonPainter( Dali::Toolkit::Internal::ButtonPainterPtr painter ) - { - return static_cast( painter.Get() ); - } -} // namespace +} // unnamed namespace Dali::Toolkit::PushButton PushButton::New() { @@ -85,465 +82,116 @@ Dali::Toolkit::PushButton PushButton::New() return pushButton; } -void PushButton::SetAutoRepeating( bool autoRepeating ) -{ - mAutoRepeating = autoRepeating; - - // An autorepeating button can't be a toggle button. - if( autoRepeating ) - { - mToggleButton = false; - if( mToggled ) - { - // Emit a signal is not wanted, only change the appearance. - Toolkit::PushButton handle( GetOwner() ); - GetPushButtonPainter( mPainter )->Toggled( handle ); - mToggled = false; - } - } - - // Notifies the painter. - GetPushButtonPainter( mPainter )->SetAutoRepeating( mAutoRepeating ); -} - -bool PushButton::IsAutoRepeating() const -{ - return mAutoRepeating; -} - -void PushButton::SetInitialAutoRepeatingDelay( float initialAutoRepeatingDelay ) -{ - DALI_ASSERT_ALWAYS( initialAutoRepeatingDelay > 0.f ); - mInitialAutoRepeatingDelay = initialAutoRepeatingDelay; -} - -float PushButton::GetInitialAutoRepeatingDelay() const -{ - return mInitialAutoRepeatingDelay; -} - -void PushButton::SetNextAutoRepeatingDelay( float nextAutoRepeatingDelay ) +PushButton::PushButton() +: Button(), + mIconAlignment( RIGHT ) { - DALI_ASSERT_ALWAYS( nextAutoRepeatingDelay > 0.f ); - mNextAutoRepeatingDelay = nextAutoRepeatingDelay; } -float PushButton::GetNextAutoRepeatingDelay() const +PushButton::~PushButton() { - return mNextAutoRepeatingDelay; } -void PushButton::SetToggleButton( bool toggle ) +void PushButton::OnInitialize() { - mToggleButton = toggle; - - // A toggle button can't be an autorepeating button. - if( toggle ) - { - mAutoRepeating = false; - - // Notifies the painter. - GetPushButtonPainter( mPainter )->SetAutoRepeating( mAutoRepeating ); - } -} + Button::OnInitialize(); -bool PushButton::IsToggleButton() const -{ - return mToggleButton; + // Push button requires the Leave event. + Actor self = Self(); + self.SetProperty( Actor::Property::LEAVE_REQUIRED, true ); } -void PushButton::SetToggled( bool toggle ) +void PushButton::SetIconAlignment( const PushButton::IconAlignment iconAlignment ) { - if( !mDimmed && mToggleButton && ( toggle != mToggled ) ) + mIconAlignment = iconAlignment; + Button::Align labelAlignment; + switch ( iconAlignment ) { - mToggled = toggle; - - Toolkit::PushButton handle( GetOwner() ); - - // Notifies the painter the button has been toggled. - GetPushButtonPainter( mPainter )->Toggled( handle ); - - // Emit signal. - mToggledSignalV2.Emit( handle, mToggled ); - } -} - -bool PushButton::IsToggled() const -{ - return mToggleButton && mToggled; -} - -void PushButton::SetButtonImage( Image image ) -{ - SetButtonImage( ImageActor::New( image ) ); -} - -void PushButton::SetButtonImage( Actor image ) -{ - Toolkit::PushButton handle( GetOwner() ); - GetPushButtonPainter( mPainter )->SetButtonImage( handle, image ); -} - -Actor& PushButton::GetButtonImage() -{ - return mButtonImage; -} - -Actor PushButton::GetButtonImage() const -{ - return mButtonImage; -} - -void PushButton::SetBackgroundImage( Image image ) -{ - SetBackgroundImage( ImageActor::New( image ) ); -} - -void PushButton::SetBackgroundImage( Actor image ) -{ - Toolkit::PushButton handle( GetOwner() ); - GetPushButtonPainter( mPainter )->SetBackgroundImage( handle, image ); -} - -Actor& PushButton::GetBackgroundImage() -{ - return mBackgroundImage; -} - -Actor PushButton::GetBackgroundImage() const -{ - return mBackgroundImage; -} - -void PushButton::SetPressedImage( Image image ) -{ - SetPressedImage( ImageActor::New( image ) ); -} - -void PushButton::SetPressedImage( Actor image ) -{ - Toolkit::PushButton handle( GetOwner() ); - GetPushButtonPainter( mPainter )->SetPressedImage( handle, image ); -} - -Actor& PushButton::GetPressedImage() -{ - return mPressedImage; -} - -Actor PushButton::GetPressedImage() const -{ - return mPressedImage; -} - -void PushButton::SetDimmedBackgroundImage( Image image ) -{ - SetDimmedBackgroundImage( ImageActor::New( image ) ); -} - -void PushButton::SetDimmedBackgroundImage( Actor image ) -{ - Toolkit::PushButton handle( GetOwner() ); - GetPushButtonPainter( mPainter )->SetDimmedBackgroundImage( handle, image ); -} - -Actor& PushButton::GetDimmedBackgroundImage() -{ - return mDimmedBackgroundImage; -} - -Actor PushButton::GetDimmedBackgroundImage() const -{ - return mDimmedBackgroundImage; -} - -void PushButton::SetDimmedImage( Image image ) -{ - SetDimmedImage( ImageActor::New( image ) ); -} - -void PushButton::SetDimmedImage( Actor image ) -{ - Toolkit::PushButton handle( GetOwner() ); - GetPushButtonPainter( mPainter )->SetDimmedImage( handle, image ); -} - -Actor& PushButton::GetDimmedImage() -{ - return mDimmedImage; -} - -Actor PushButton::GetDimmedImage() const -{ - return mDimmedImage; -} - -void PushButton::SetLabelText( const std::string& text ) -{ - Toolkit::TextView textView ( Toolkit::TextView::New( text ) ); - textView.SetWidthExceedPolicy( Toolkit::TextView::ShrinkToFit ); // Make sure our text always fits inside the button - SetLabelText( textView ); -} - -void PushButton::SetLabelText( Actor text ) -{ - Toolkit::PushButton handle( GetOwner() ); - GetPushButtonPainter( mPainter )->SetLabelText( handle, text ); -} - -Actor& PushButton::GetLabel() -{ - return mLabel; -} - -Actor PushButton::GetLabelText() const -{ - return mLabel; -} - -Actor& PushButton::GetFadeOutBackgroundImage() -{ - return mFadeOutBackgroundImage; -} - -Actor& PushButton::GetFadeOutButtonImage() -{ - return mFadeOutButtonImage; -} - -Toolkit::PushButton::ToggledSignalV2& PushButton::ToggledSignal() -{ - return mToggledSignalV2; -} - -Toolkit::PushButton::PressedSignalV2& PushButton::PressedSignal() -{ - return mPressedSignalV2; -} - -Toolkit::PushButton::ReleasedSignalV2& PushButton::ReleasedSignal() -{ - return mReleasedSignalV2; -} - -bool PushButton::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) -{ - Dali::BaseHandle handle( object ); - - bool connected( true ); - Toolkit::PushButton button = Toolkit::PushButton::DownCast(handle); - - if( Toolkit::PushButton::SIGNAL_TOGGLED == signalName ) + case RIGHT: { - button.ToggledSignal().Connect( tracker, functor ); + labelAlignment = Button::BEGIN; + break; } - else if( Toolkit::PushButton::SIGNAL_PRESSED == signalName ) + case TOP: { - button.PressedSignal().Connect( tracker, functor ); + labelAlignment = Button::BOTTOM; + break; } - else if( Toolkit::PushButton::SIGNAL_RELEASED == signalName ) + case BOTTOM: { - button.ReleasedSignal().Connect( tracker, functor ); + labelAlignment = Button::TOP; + break; } - else - { - // signalName does not match any signal - connected = false; + case LEFT: + default: + labelAlignment = Button::END; + break; } - return connected; + Button::SetLabelAlignment( labelAlignment ); } -void PushButton::OnButtonInitialize() +const PushButton::IconAlignment PushButton::GetIconAlignment() const { - // Push button requires the Leave event. - Actor root = Self(); - root.SetLeaveRequired( true ); + return mIconAlignment; } -void PushButton::OnButtonDown() +void PushButton::SetProperty( BaseObject* object, Property::Index propertyIndex, const Property::Value& value ) { - if( !mToggleButton ) - { - Toolkit::PushButton handle( GetOwner() ); - - // Notifies the painter the button has been pressed. - GetPushButtonPainter( mPainter )->Pressed( handle ); - - if( mAutoRepeating ) - { - SetUpTimer( mInitialAutoRepeatingDelay ); - } - - //Emit signal. - mPressedSignalV2.Emit( handle ); - } -} + Toolkit::PushButton pushButton = Toolkit::PushButton::DownCast( Dali::BaseHandle( object ) ); -void PushButton::OnButtonUp() -{ - if( ButtonDown == mState ) + if ( pushButton ) { - if( mToggleButton ) - { - mToggled = !mToggled; - - Toolkit::PushButton handle( GetOwner() ); + PushButton& pushButtonImpl( GetImplementation( pushButton ) ); - // Notifies the painter the button has been toggled. - GetPushButtonPainter( mPainter )->Toggled( handle ); + // Properties remain here for Tizen 3.0 legacy requirements. Are now in Button base class - //Emit signal. - mToggledSignalV2.Emit( handle, mToggled ); - } - else + switch ( propertyIndex ) { - Toolkit::PushButton handle( GetOwner() ); - - // Notifies the painter the button has been clicked. - GetPushButtonPainter( mPainter )->Released( handle ); - GetPushButtonPainter( mPainter )->Clicked( handle ); - - if( mAutoRepeating ) + case Toolkit::PushButton::Property::LABEL_PADDING: { - mAutoRepeatingTimer.Reset(); + Vector4 padding ( value.Get< Vector4 >() ); + pushButtonImpl.Button::SetLabelPadding( Padding( padding.x, padding.y, padding.z, padding.w ) ); + break; } - - //Emit signal. - mReleasedSignalV2.Emit( handle ); - mClickedSignalV2.Emit( handle ); - } - } -} - -void PushButton::OnTouchPointLeave() -{ - if( ButtonDown == mState ) - { - if( !mToggleButton ) - { - Toolkit::PushButton handle( GetOwner() ); - - // Notifies the painter the button has been released. - GetPushButtonPainter( mPainter )->Released( handle ); - - if( mAutoRepeating ) + case Toolkit::PushButton::Property::ICON_PADDING: { - mAutoRepeatingTimer.Reset(); + Vector4 padding ( value.Get< Vector4 >() ); + pushButtonImpl.Button::SetForegroundPadding( Padding( padding.x, padding.y, padding.z, padding.w ) ); + break; } - - //Emit signal. - mReleasedSignalV2.Emit( handle ); } } } -void PushButton::OnTouchPointInterrupted() -{ - OnTouchPointLeave(); -} - -void PushButton::OnAnimationTimeSet( float animationTime ) -{ - GetPushButtonPainter( mPainter )->SetAnimationTime( animationTime ); -} - -float PushButton::OnAnimationTimeRequested() const -{ - return GetPushButtonPainter( mPainter )->GetAnimationTime(); -} - -PushButton::PushButton() -: Button(), - mAutoRepeating( false ), - mInitialAutoRepeatingDelay( INITIAL_AUTOREPEATING_DELAY ), - mNextAutoRepeatingDelay( NEXT_AUTOREPEATING_DELAY ), - mToggleButton( false ), - mAutoRepeatingTimer(), - mToggled( false ), - mClickActionPerforming(false) -{ - // Creates specific painter. - mPainter = PushButtonDefaultPainterPtr( new PushButtonDefaultPainter() ); -} - -PushButton::~PushButton() -{ - if( mAutoRepeatingTimer ) - { - mAutoRepeatingTimer.Reset(); - } - - mPainter = NULL; -} - -void PushButton::SetUpTimer( float delay ) +Property::Value PushButton::GetProperty( BaseObject* object, Property::Index propertyIndex ) { - mAutoRepeatingTimer = Dali::Timer::New( static_cast( 1000.f * delay ) ); - mAutoRepeatingTimer.TickSignal().Connect( this, &PushButton::AutoRepeatingSlot ); - mAutoRepeatingTimer.Start(); -} - -bool PushButton::AutoRepeatingSlot() -{ - bool consumed = false; - if( !mDimmed ) - { - // Restart the autorepeat timer. - SetUpTimer( mNextAutoRepeatingDelay ); + Property::Value value; - Toolkit::PushButton handle( GetOwner() ); + Toolkit::PushButton pushButton = Toolkit::PushButton::DownCast( Dali::BaseHandle( object ) ); - // Notifies the painter the button has been pressed. - GetPushButtonPainter( mPainter )->Pressed( handle ); - - //Emit signal. - consumed = mReleasedSignalV2.Emit( handle ); - consumed |= mClickedSignalV2.Emit( handle ); - consumed |= mPressedSignalV2.Emit( handle ); - } - - return consumed; -} - -void PushButton::OnActivated() -{ - // When the button is activated, it performs the click action - std::vector attributes; - DoClickAction(attributes); -} - -void PushButton::DoClickAction(const PropertyValueContainer& attributes) -{ - // Prevents the button signals from doing a recursive loop by sending an action - // and re-emitting the signals. - if(!mClickActionPerforming) + if ( pushButton ) { - mClickActionPerforming = true; - OnButtonDown(); - mState = ButtonDown; - OnButtonUp(); - mClickActionPerforming = false; - } -} - -bool PushButton::DoAction(BaseObject* object, const std::string& actionName, const std::vector& attributes) -{ - bool ret = false; - - Dali::BaseHandle handle(object); + PushButton& pushButtonImpl( GetImplementation( pushButton ) ); - Toolkit::PushButton button = Toolkit::PushButton::DownCast(handle); - - DALI_ASSERT_ALWAYS(button); - - if(Toolkit::PushButton::ACTION_PUSH_BUTTON_CLICK == actionName) - { - GetImplementation(button).DoClickAction(attributes); - ret = true; + switch ( propertyIndex ) + { + case Toolkit::PushButton::Property::LABEL_PADDING: + { + 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; + } + } } - return ret; + return value; } } // namespace Internal