#include "push-button-impl.h"
// EXTERNAL INCLUDES
-#include <algorithm>
#include <dali/public-api/actors/image-actor.h>
#include <dali/public-api/object/type-registry.h>
-#include <dali/public-api/scripting/scripting.h>
// INTERNAL INCLUDES
-#include "push-button-default-painter-impl.h"
-
-#include <dali-toolkit/internal/controls/relayout-helper.h>
+#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
namespace Dali
{
namespace
{
+const float TEXT_PADDING = 12.0f;
+
+const float LABEL_DEPTH( 0.75f );
+const float FOREGROUND_DEPTH( 0.5f );
+const float BACKGROUND_DEPTH( 0.25f );
+
+const float ANIMATION_TIME( 0.2f );
+
BaseHandle Create()
{
return Toolkit::PushButton::New();
TypeRegistration typeRegistration( typeid(Toolkit::PushButton), typeid(Toolkit::Button), Create );
-SignalConnectorType signalConnector1( typeRegistration, Toolkit::PushButton::SIGNAL_PRESSED , &PushButton::DoConnectSignal );
-SignalConnectorType signalConnector2( typeRegistration, Toolkit::PushButton::SIGNAL_RELEASED, &PushButton::DoConnectSignal );
-
-TypeAction action1( typeRegistration, Toolkit::PushButton::ACTION_PUSH_BUTTON_CLICK, &PushButton::DoAction );
-
} // unnamed namespace
namespace
{
-const unsigned int INITIAL_AUTOREPEATING_DELAY( 0.15f );
-const unsigned int NEXT_AUTOREPEATING_DELAY( 0.05f );
-
-const float TEXT_PADDING = 12.0f;
-
-// Helper function used to cast a ButtonPainter to PushButtonDefaultPainter
-PushButtonDefaultPainterPtr GetPushButtonPainter( Dali::Toolkit::Internal::ButtonPainterPtr painter )
-{
- return static_cast<PushButtonDefaultPainter*>( painter.Get() );
-}
-
/**
* Find the first image actor in the actor hierarchy
*/
return imageActor;
}
-
} // unnamed namespace
Dali::Toolkit::PushButton PushButton::New()
return pushButton;
}
-void PushButton::SetAutoRepeating( bool autoRepeating )
+PushButton::PushButton()
+: Button(),
+ mSize(),
+ mPaintState( UnselectedState )
{
- mAutoRepeating = autoRepeating;
+ SetAnimationTime( ANIMATION_TIME );
+}
+
+PushButton::~PushButton()
+{
+}
+
+void PushButton::SetButtonImage( Actor image )
+{
+ Actor& buttonImage = GetButtonImage();
+ Actor& fadeOutButtonImage = GetFadeOutButtonImage();
- // An autorepeating button can't be a toggle button.
- if( autoRepeating )
+ switch( mPaintState )
{
- mToggleButton = false;
- if( mToggled )
+ case UnselectedState:
{
- // Emit a signal is not wanted, only change the appearance.
- Toolkit::PushButton handle( GetOwner() );
- GetPushButtonPainter( mPainter )->Toggled( handle );
- mToggled = false;
+ if( buttonImage && buttonImage.GetParent() )
+ {
+ StopFadeOutAnimation();
+ FadeOutImage( Foreground, buttonImage );
+
+ buttonImage = image;
+
+ FadeInImage( buttonImage, 0.0f, 0 );
+
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+ }
+ else
+ {
+ buttonImage = image;
+ Self().Insert( 0, buttonImage );
+ }
+ break;
}
- }
+ case UnselectedSelectedTransition: // FALLTHROUGH
+ case UnselectedDisabledTransition:
+ {
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
+ {
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation();
- // Notifies the painter.
- GetPushButtonPainter( mPainter )->SetAutoRepeating( mAutoRepeating );
-}
+ // Replaces the button image.
+ buttonImage = image;
-bool PushButton::IsAutoRepeating() const
-{
- return mAutoRepeating;
-}
+ Self().Insert( 0, buttonImage );
+ FadeOutImage( Foreground, buttonImage, opacity );
-void PushButton::SetInitialAutoRepeatingDelay( float initialAutoRepeatingDelay )
-{
- DALI_ASSERT_ALWAYS( initialAutoRepeatingDelay > 0.f );
- mInitialAutoRepeatingDelay = initialAutoRepeatingDelay;
-}
+ StartFadeOutAnimation();
+ break;
+ }
+ case SelectedUnselectedTransition: // FALLTHROUGH
+ case DisabledUnselectedTransition:
+ {
+ StopFadeInAnimation();
+ Self().Remove( buttonImage );
-float PushButton::GetInitialAutoRepeatingDelay() const
-{
- return mInitialAutoRepeatingDelay;
-}
+ buttonImage = image;
-void PushButton::SetNextAutoRepeatingDelay( float nextAutoRepeatingDelay )
-{
- DALI_ASSERT_ALWAYS( nextAutoRepeatingDelay > 0.f );
- mNextAutoRepeatingDelay = nextAutoRepeatingDelay;
-}
+ FadeInImage( buttonImage, 0.0f, 0 );
+ StartFadeInAnimation();
+ break;
+ }
+ default:
+ buttonImage = image;
+ break;
+ }
-float PushButton::GetNextAutoRepeatingDelay() const
-{
- return mNextAutoRepeatingDelay;
+ buttonImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+ buttonImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ buttonImage.SetPosition( 0.f, 0.f, FOREGROUND_DEPTH );
+ buttonImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+ buttonImage.SetName( "BUTTON_IMAGE" );
}
-void PushButton::SetToggleButton( bool toggle )
+void PushButton::SetSelectedImage( Actor image )
{
- mToggleButton = toggle;
+ Actor& selectedImage = GetSelectedImage();
+ Actor& fadeOutButtonImage = GetFadeOutButtonImage();
- // A toggle button can't be an autorepeating button.
- if( toggle )
+ switch( mPaintState )
{
- mAutoRepeating = false;
+ case SelectedState:
+ {
+ if( selectedImage && selectedImage.GetParent() )
+ {
+ StopFadeOutAnimation();
+ FadeOutImage( Foreground, selectedImage );
+
+ selectedImage = image;
+
+ FadeInImage( selectedImage, 0.0f, 0 );
+
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+ }
+ else
+ {
+ selectedImage = image;
+ Self().Insert( 0, selectedImage );
+ }
+ break;
+ }
+ case SelectedUnselectedTransition: // FALLTHROUGH
+ case SelectedDisabledTransition:
+ {
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
+ {
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation();
- // Notifies the painter.
- GetPushButtonPainter( mPainter )->SetAutoRepeating( mAutoRepeating );
+ // Replaces the button image.
+ selectedImage = image;
+
+ Self().Insert( 0, selectedImage );
+ FadeOutImage( Foreground, selectedImage, opacity );
+
+ StartFadeOutAnimation();
+ break;
+ }
+ case UnselectedSelectedTransition: // FALLTHROUGH
+ case DisabledSelectedTransition:
+ {
+ StopFadeInAnimation();
+ Self().Remove( selectedImage );
+
+ selectedImage = image;
+
+ FadeInImage( selectedImage, 0.0f, 0 );
+ StartFadeInAnimation();
+ break;
+ }
+ default:
+ selectedImage = image;
+ break;
}
-}
-bool PushButton::IsToggleButton() const
-{
- return mToggleButton;
+ selectedImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+ selectedImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ selectedImage.SetPosition( 0.f, 0.f, FOREGROUND_DEPTH );
+ selectedImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
}
-void PushButton::SetToggled( bool toggle )
+void PushButton::SetBackgroundImage( Actor image )
{
- if( !mDisabled && mToggleButton && ( toggle != mToggled ) )
+ Actor& backgroundImage = GetBackgroundImage();
+ Actor& fadeOutBackgroundImage = GetFadeOutBackgroundImage();
+
+ switch( mPaintState )
{
- mToggled = toggle;
+ case UnselectedState: // FALLTHROUGH
+ case SelectedState:
+ case UnselectedSelectedTransition:
+ case SelectedUnselectedTransition:
+ {
+ if( backgroundImage && backgroundImage.GetParent() )
+ {
+ StopFadeOutAnimation();
+ FadeOutImage( Background, backgroundImage );
- Toolkit::PushButton handle( GetOwner() );
+ backgroundImage = image;
- // Notifies the painter the button has been toggled.
- GetPushButtonPainter( mPainter )->Toggled( handle );
+ FadeInImage( backgroundImage, 0.0f, 0 );
- // Emit signal.
- mStateChangedSignal.Emit( handle, mToggled );
- }
-}
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+ }
+ else
+ {
+ backgroundImage = image;
+ Self().Insert( 0, backgroundImage );
+ }
+ break;
+ }
+ case UnselectedDisabledTransition: // FALLTHROUGH
+ case SelectedDisabledTransition:
+ {
+ float opacity = 1.f;
+ if( fadeOutBackgroundImage )
+ {
+ opacity = fadeOutBackgroundImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation();
-bool PushButton::IsToggled() const
-{
- return mToggleButton && mToggled;
-}
+ // Replaces the button image.
+ backgroundImage = image;
-void PushButton::SetButtonImage( Image image )
-{
- SetButtonImage( ImageActor::New( image ) );
-}
+ Self().Insert( 0, backgroundImage );
+ FadeOutImage( Background, backgroundImage, opacity );
-void PushButton::SetButtonImage( Actor image )
-{
- Toolkit::PushButton handle( GetOwner() );
- GetPushButtonPainter( mPainter )->SetButtonImage( handle, image );
-}
+ StartFadeOutAnimation();
+ break;
+ }
+ case DisabledUnselectedTransition: // FALLTHROUGH
+ case DisabledSelectedTransition:
+ {
+ StopFadeInAnimation();
+ Self().Remove( backgroundImage );
-Actor& PushButton::GetButtonImage()
-{
- return mButtonImage;
-}
+ backgroundImage = image;
-Actor PushButton::GetButtonImage() const
-{
- return mButtonImage;
-}
+ FadeInImage( backgroundImage, 0.0f, 0 );
+ StartFadeInAnimation();
+ break;
+ }
+ default:
+ backgroundImage = image;
+ break;
+ }
-void PushButton::SetBackgroundImage( Image image )
-{
- SetBackgroundImage( ImageActor::New( image ) );
+ backgroundImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+ backgroundImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ backgroundImage.SetPosition( 0.f, 0.f, BACKGROUND_DEPTH );
+ backgroundImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
}
-void PushButton::SetBackgroundImage( Actor image )
+void PushButton::SetDisabledImage( Actor image )
{
- Toolkit::PushButton handle( GetOwner() );
- GetPushButtonPainter( mPainter )->SetBackgroundImage( handle, image );
-}
+ Actor& disabledImage = GetDisabledImage();
+ Actor& fadeOutButtonImage = GetFadeOutButtonImage();
-Actor& PushButton::GetBackgroundImage()
-{
- return mBackgroundImage;
-}
+ switch( mPaintState )
+ {
+ case DisabledUnselectedState: // FALLTHROUGH
+ case DisabledSelectedState:
+ {
+ if( disabledImage && disabledImage.GetParent() )
+ {
+ StopFadeOutAnimation();
+ FadeOutImage( Foreground, disabledImage );
-Actor PushButton::GetBackgroundImage() const
-{
- return mBackgroundImage;
-}
+ disabledImage = image;
-void PushButton::SetSelectedImage( Image image )
-{
- SetSelectedImage( ImageActor::New( image ) );
-}
+ FadeInImage( disabledImage, 0.0f, 0 );
-void PushButton::SetSelectedImage( Actor image )
-{
- Toolkit::PushButton handle( GetOwner() );
- GetPushButtonPainter( mPainter )->SetSelectedImage( handle, image );
-}
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+ }
+ else
+ {
+ disabledImage = image;
+ Self().Add( disabledImage );
+ }
+ break;
+ }
+ case UnselectedDisabledTransition: // FALLTHROUGH
+ case SelectedDisabledTransition:
+ {
+ StopFadeInAnimation();
+ Self().Remove( disabledImage );
-Actor& PushButton::GetSelectedImage()
-{
- return mSelectedImage;
-}
+ disabledImage = image;
-Actor PushButton::GetSelectedImage() const
-{
- return mSelectedImage;
-}
+ FadeInImage( disabledImage, 0.0f, 0 );
+ StartFadeInAnimation();
+ break;
+ }
+ case DisabledUnselectedTransition: // FALLTHROUGH
+ case DisabledSelectedTransition:
+ {
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
+ {
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation();
-void PushButton::SetDisabledBackgroundImage( Image image )
-{
- SetDisabledBackgroundImage( ImageActor::New( image ) );
-}
+ // Replaces the button image.
+ disabledImage = image;
-void PushButton::SetDisabledBackgroundImage( Actor image )
-{
- Toolkit::PushButton handle( GetOwner() );
- GetPushButtonPainter( mPainter )->SetDisabledBackgroundImage( handle, image );
-}
+ Self().Add( disabledImage );
+ FadeOutImage( Foreground, disabledImage, opacity );
-Actor& PushButton::GetDisabledBackgroundImage()
-{
- return mDisabledBackgroundImage;
-}
+ StartFadeOutAnimation();
+ break;
+ }
+ default:
+ disabledImage = image;
+ break;
+ }
-Actor PushButton::GetDisabledBackgroundImage() const
-{
- return mDisabledBackgroundImage;
+ disabledImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+ disabledImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ disabledImage.SetPosition( 0.f, 0.f, FOREGROUND_DEPTH );
+ disabledImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
}
-void PushButton::SetDisabledImage( Image image )
+void PushButton::SetDisabledBackgroundImage( Actor image )
{
- SetDisabledImage( ImageActor::New( image ) );
-}
+ Actor& disabledBackgroundImage = GetDisabledBackgroundImage();
+ Actor& fadeOutBackgroundImage = GetFadeOutBackgroundImage();
-void PushButton::SetDisabledImage( Actor image )
-{
- Toolkit::PushButton handle( GetOwner() );
- GetPushButtonPainter( mPainter )->SetDisabledImage( handle, image );
-}
+ switch( mPaintState )
+ {
+ case DisabledUnselectedState: // FALLTHROUGH
+ case DisabledSelectedState:
+ {
+ if( disabledBackgroundImage && disabledBackgroundImage.GetParent() )
+ {
+ StopFadeOutAnimation();
+ FadeOutImage( Background, disabledBackgroundImage );
-Actor& PushButton::GetDisabledImage()
-{
- return mDisabledImage;
-}
+ disabledBackgroundImage = image;
-Actor PushButton::GetDisabledImage() const
-{
- return mDisabledImage;
-}
+ FadeInImage( disabledBackgroundImage, 0.0f, 0 );
-void PushButton::SetLabel( const std::string& label )
-{
- // TODO
-}
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+ }
+ else
+ {
+ disabledBackgroundImage = image;
+ Self().Add( disabledBackgroundImage );
+ }
+ break;
+ }
+ case UnselectedDisabledTransition: // FALLTHROUGH
+ case SelectedDisabledTransition:
+ {
+ StopFadeInAnimation();
+ Self().Remove( disabledBackgroundImage );
-void PushButton::SetLabel( Actor label )
-{
- Toolkit::PushButton handle( GetOwner() );
- GetPushButtonPainter( mPainter )->SetLabel( handle, label );
-}
+ disabledBackgroundImage = image;
-Actor PushButton::GetLabel() const
-{
- return mLabel;
-}
+ FadeInImage( disabledBackgroundImage, 0.0f, 0 );
+ StartFadeInAnimation();
+ break;
+ }
+ case DisabledUnselectedTransition: // FALLTHROUGH
+ case DisabledSelectedTransition:
+ {
+ float opacity = 1.f;
+ if( fadeOutBackgroundImage )
+ {
+ opacity = fadeOutBackgroundImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation();
-Actor& PushButton::GetLabel()
-{
- return mLabel;
-}
+ // Replaces the button image.
+ disabledBackgroundImage = image;
-Actor& PushButton::GetFadeOutBackgroundImage()
-{
- return mFadeOutBackgroundImage;
-}
+ Self().Add( disabledBackgroundImage );
+ FadeOutImage( Background, disabledBackgroundImage, opacity );
-Actor& PushButton::GetFadeOutButtonImage()
-{
- return mFadeOutButtonImage;
-}
+ StartFadeOutAnimation();
+ break;
+ }
+ default:
+ disabledBackgroundImage = image;
+ break;
+ }
-Toolkit::PushButton::PressedSignalType& PushButton::PressedSignal()
-{
- return mPressedSignal;
+ disabledBackgroundImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+ disabledBackgroundImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ disabledBackgroundImage.SetPosition( 0.f, 0.f, BACKGROUND_DEPTH );
+ disabledBackgroundImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
}
-Toolkit::PushButton::ReleasedSignalType& PushButton::ReleasedSignal()
+void PushButton::OnButtonInitialize()
{
- return mReleasedSignal;
+ // Push button requires the Leave event.
+ Actor root = Self();
+ root.SetLeaveRequired( true );
+
+ // Set resize policy to natural size so that buttons will resize to background images
+ root.SetResizePolicy( USE_NATURAL_SIZE, ALL_DIMENSIONS );
}
-bool PushButton::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
+void PushButton::OnLabelSet()
{
- Dali::BaseHandle handle( object );
-
- bool connected( true );
- Toolkit::PushButton button = Toolkit::PushButton::DownCast(handle);
+ Actor& label = GetLabel();
- if( Toolkit::PushButton::SIGNAL_STATE_CHANGED == signalName )
+ if( label )
{
- button.StateChangedSignal().Connect( tracker, functor );
- }
- else if( Toolkit::PushButton::SIGNAL_PRESSED == signalName )
- {
- button.PressedSignal().Connect( tracker, functor );
- }
- else if( Toolkit::PushButton::SIGNAL_RELEASED == signalName )
- {
- button.ReleasedSignal().Connect( tracker, functor );
- }
- else
- {
- // signalName does not match any signal
- connected = false;
- }
+ label.SetAnchorPoint( AnchorPoint::CENTER );
+ label.SetParentOrigin( ParentOrigin::CENTER );
+ label.SetPosition( 0.f, 0.f, LABEL_DEPTH );
+ label.SetSize( mSize );
- return connected;
+ Self().Add( label );
+ }
}
-void PushButton::SetProperty( BaseObject* object, Property::Index propertyIndex, const Property::Value& value )
+void PushButton::OnSelected( bool selected )
{
- Toolkit::PushButton pushButton = Toolkit::PushButton::DownCast( Dali::BaseHandle( object ) );
+ Actor& selectedImage = GetSelectedImage();
+ Actor& buttonImage = GetButtonImage();
+ Actor& fadeOutButtonImage = GetFadeOutButtonImage();
- if ( pushButton )
+ switch( mPaintState )
{
- PushButton& pushButtonImpl( GetImplementation( pushButton ) );
-
- if ( propertyIndex == Toolkit::Button::PROPERTY_AUTO_REPEATING )
- {
- pushButtonImpl.SetAutoRepeating( value.Get< bool >() );
- }
- else if ( propertyIndex == Toolkit::Button::PROPERTY_INITIAL_AUTO_REPEATING_DELAY )
+ case UnselectedState:
{
- pushButtonImpl.SetInitialAutoRepeatingDelay( value.Get< float >() );
- }
- else if ( propertyIndex == Toolkit::Button::PROPERTY_NEXT_AUTO_REPEATING_DELAY )
- {
- pushButtonImpl.SetNextAutoRepeatingDelay( value.Get< float >() );
- }
- else if ( propertyIndex == Toolkit::Button::PROPERTY_TOGGLABLE )
- {
- pushButtonImpl.SetToggleButton( value.Get< bool >() );
- }
- else if ( propertyIndex == Toolkit::Button::PROPERTY_TOGGLED )
- {
- pushButtonImpl.SetToggled( value.Get< bool >() );
+ StopFadeOutAnimation();
+ FadeOutImage( Foreground, buttonImage );
+ FadeInImage( selectedImage, 0.0f, 0 );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( buttonImage || selectedImage )
+ {
+ mPaintState = UnselectedSelectedTransition;
+ }
+ else
+ {
+ mPaintState = SelectedState;
+ }
+ break;
}
- else if ( propertyIndex == Toolkit::Button::PROPERTY_NORMAL_STATE_ACTOR )
+ case SelectedState:
{
- pushButtonImpl.SetButtonImage( Scripting::NewActor( value.Get< Property::Map >() ) );
+ StopFadeOutAnimation();
+ FadeOutImage( Foreground, selectedImage );
+ FadeInImage( buttonImage, 0.0f, 0 );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( buttonImage || selectedImage )
+ {
+ mPaintState = SelectedUnselectedTransition;
+ }
+ else
+ {
+ mPaintState = UnselectedState;
+ }
+ break;
}
- else if ( propertyIndex == Toolkit::Button::PROPERTY_SELECTED_STATE_ACTOR )
+ case UnselectedSelectedTransition:
{
- pushButtonImpl.SetSelectedImage( Scripting::NewActor( value.Get< Property::Map >() ) );
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
+ {
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation( false );
+ StopFadeInAnimation();
+
+ FadeOutImage( Foreground, selectedImage, 1.f - opacity );
+ FadeInImage( buttonImage, opacity, 0 );
+
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( buttonImage || selectedImage )
+ {
+ mPaintState = SelectedUnselectedTransition;
+ }
+ else
+ {
+ mPaintState = UnselectedState;
+ }
+ break;
}
- else if ( propertyIndex == Toolkit::Button::PROPERTY_DISABLED_STATE_ACTOR )
+ case SelectedUnselectedTransition:
{
- pushButtonImpl.SetDisabledImage( Scripting::NewActor( value.Get< Property::Map >() ) );
+ float opacity = 0.f;
+ if( fadeOutButtonImage )
+ {
+ opacity = 1.f - fadeOutButtonImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation( false );
+ StopFadeInAnimation();
+
+ FadeOutImage( Foreground, buttonImage, 1.f - opacity );
+ FadeInImage( selectedImage, opacity, 0 );
+
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( buttonImage || selectedImage )
+ {
+ mPaintState = UnselectedSelectedTransition;
+ }
+ else
+ {
+ mPaintState = SelectedState;
+ }
+ break;
}
- else if ( propertyIndex == Toolkit::Button::PROPERTY_LABEL_ACTOR )
+ default:
{
- pushButtonImpl.SetLabel( Scripting::NewActor( value.Get< Property::Map >() ) );
+ break;
}
}
}
-Property::Value PushButton::GetProperty( BaseObject* object, Property::Index propertyIndex )
+void PushButton::OnDisabled( bool disabled )
{
- Property::Value value;
-
- Toolkit::PushButton pushButton = Toolkit::PushButton::DownCast( Dali::BaseHandle( object ) );
+ Actor& buttonImage = GetButtonImage();
+ Actor& selectedImage = GetSelectedImage();
+ Actor& backgroundImage = GetBackgroundImage();
+ Actor& disabledImage = GetDisabledImage();
+ Actor& disabledBackgroundImage = GetDisabledBackgroundImage();
+ Actor& fadeOutButtonImage = GetFadeOutButtonImage();
- if ( pushButton )
+ switch( mPaintState )
{
- PushButton& pushButtonImpl( GetImplementation( pushButton ) );
-
- if ( propertyIndex == Toolkit::Button::PROPERTY_AUTO_REPEATING )
- {
- value = pushButtonImpl.mAutoRepeating;
- }
- else if ( propertyIndex == Toolkit::Button::PROPERTY_INITIAL_AUTO_REPEATING_DELAY )
- {
- value = pushButtonImpl.mInitialAutoRepeatingDelay;
- }
- else if ( propertyIndex == Toolkit::Button::PROPERTY_NEXT_AUTO_REPEATING_DELAY )
- {
- value = pushButtonImpl.mNextAutoRepeatingDelay;
- }
- else if ( propertyIndex == Toolkit::Button::PROPERTY_TOGGLABLE )
+ case UnselectedState:
+ {
+ if( disabled )
{
- value = pushButtonImpl.mToggleButton;
+ StopFadeOutAnimation();
+ FadeOutImage( Background, backgroundImage );
+ FadeOutImage( Foreground, buttonImage );
+ FadeInImage( disabledBackgroundImage, 0.0f, 0 );
+ FadeInImage( disabledImage, 0.0f, 0 );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
+ {
+ mPaintState = UnselectedDisabledTransition;
+ }
+ else
+ {
+ mPaintState = DisabledUnselectedState;
+ }
}
- else if ( propertyIndex == Toolkit::Button::PROPERTY_TOGGLED )
+ break;
+ }
+ case SelectedState:
+ {
+ if( disabled )
{
- value = pushButtonImpl.mToggled;
+ StopFadeOutAnimation();
+ FadeOutImage( Background, backgroundImage );
+ FadeOutImage( Foreground, selectedImage );
+ FadeInImage( disabledBackgroundImage, 0.0f, 0 );
+ FadeInImage( disabledImage, 0.0f, 0 );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
+ {
+ mPaintState = SelectedDisabledTransition;
+ }
+ else
+ {
+ mPaintState = DisabledSelectedState;
+ }
}
- else if ( propertyIndex == Toolkit::Button::PROPERTY_NORMAL_STATE_ACTOR )
+ break;
+ }
+ case DisabledUnselectedState:
+ {
+ if( !disabled )
{
- Property::Map map;
- Scripting::CreatePropertyMap( pushButtonImpl.mButtonImage, map );
- value = map;
+ StopFadeOutAnimation();
+ FadeOutImage( Background, disabledBackgroundImage );
+ FadeOutImage( Foreground, disabledImage );
+ FadeInImage( backgroundImage, 0.0f, 0 );
+ FadeInImage( buttonImage, 0.0f, 0 );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
+ {
+ mPaintState = DisabledUnselectedTransition;
+ }
+ else
+ {
+ mPaintState = UnselectedState;
+ }
}
- else if ( propertyIndex == Toolkit::Button::PROPERTY_SELECTED_STATE_ACTOR )
+ break;
+ }
+ case DisabledSelectedState:
+ {
+ if( !disabled )
{
- Property::Map map;
- Scripting::CreatePropertyMap( pushButtonImpl.mSelectedImage, map );
- value = map;
+ StopFadeOutAnimation();
+ FadeOutImage( Background, disabledBackgroundImage );
+ FadeOutImage( Foreground, disabledImage );
+ FadeInImage( backgroundImage, 0.0f, 0 );
+ FadeInImage( selectedImage, 0.0f, 0 );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
+ {
+ mPaintState = DisabledSelectedTransition;
+ }
+ else
+ {
+ mPaintState = SelectedState;
+ }
}
- else if ( propertyIndex == Toolkit::Button::PROPERTY_DISABLED_STATE_ACTOR )
+ break;
+ }
+ case UnselectedSelectedTransition:
+ {
+ if( disabled )
{
- Property::Map map;
- Scripting::CreatePropertyMap( pushButtonImpl.mDisabledImage, map );
- value = map;
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
+ {
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation();
+ StopFadeInAnimation();
+
+ FadeOutImage( Foreground, selectedImage, 1.f - opacity );
+ FadeOutImage( Background, backgroundImage );
+
+ FadeInImage( disabledImage, 0.0f, 0 );
+ FadeInImage( disabledBackgroundImage, 0.0f, 0 );
+
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
+ {
+ mPaintState = SelectedDisabledTransition;
+ }
+ else
+ {
+ mPaintState = DisabledSelectedState;
+ }
}
- else if ( propertyIndex == Toolkit::Button::PROPERTY_LABEL_ACTOR )
+ break;
+ }
+ case SelectedUnselectedTransition:
+ {
+ if( disabled )
{
- Property::Map map;
- Scripting::CreatePropertyMap( pushButtonImpl.mLabel, map );
- value = map;
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
+ {
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation();
+ StopFadeInAnimation();
+
+ FadeOutImage( Foreground, buttonImage, 1.f - opacity );
+ FadeOutImage( Background, backgroundImage );
+
+ FadeInImage( disabledImage, 0.0f, 0);
+ FadeInImage( disabledBackgroundImage, 0.0f, 0 );
+
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
+ {
+ mPaintState = UnselectedDisabledTransition;
+ }
+ else
+ {
+ mPaintState = DisabledUnselectedState;
+ }
}
+ break;
}
+ case UnselectedDisabledTransition:
+ {
+ if( !disabled )
+ {
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
+ {
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation( false );
+ StopFadeInAnimation();
- return value;
-}
+ FadeOutImage( Foreground, disabledImage, 1.f - opacity );
+ FadeOutImage( Background, disabledBackgroundImage, 1.f - opacity );
+ FadeInImage( buttonImage, opacity, 0 );
+ FadeInImage( backgroundImage, opacity, 0 );
-void PushButton::OnButtonInitialize()
-{
- // Push button requires the Leave event.
- Actor root = Self();
- root.SetLeaveRequired( true );
-}
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
-void PushButton::OnButtonDown()
-{
- if( !mToggleButton )
+ if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
+ {
+ mPaintState = DisabledUnselectedTransition;
+ }
+ else
+ {
+ mPaintState = UnselectedState;
+ }
+ }
+ break;
+ }
+ case DisabledUnselectedTransition:
{
- Toolkit::PushButton handle( GetOwner() );
+ if( disabled )
+ {
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
+ {
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation( false );
+ StopFadeInAnimation();
- // Notifies the painter the button has been pressed.
- GetPushButtonPainter( mPainter )->Pressed( handle );
+ FadeOutImage( Foreground, buttonImage, 1.f - opacity );
+ FadeOutImage( Background, backgroundImage, 1.f - opacity );
+ FadeInImage( disabledImage, opacity, 0 );
+ FadeInImage( disabledBackgroundImage, opacity, 0 );
- if( mAutoRepeating )
- {
- SetUpTimer( mInitialAutoRepeatingDelay );
- }
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
- //Emit signal.
- mPressedSignal.Emit( handle );
+ if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
+ {
+ mPaintState = UnselectedDisabledTransition;
+ }
+ else
+ {
+ mPaintState = DisabledUnselectedState;
+ }
+ }
+ break;
}
-}
-
-void PushButton::OnButtonUp()
-{
- if( ButtonDown == mState )
+ case SelectedDisabledTransition:
{
- if( mToggleButton )
+ if( !disabled )
{
- mToggled = !mToggled;
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
+ {
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation( false );
+ StopFadeInAnimation();
- Toolkit::PushButton handle( GetOwner() );
+ FadeOutImage( Foreground, disabledImage, 1.f - opacity );
+ FadeOutImage( Background, disabledBackgroundImage, 1.f - opacity );
+ FadeInImage( selectedImage, opacity, 0 );
+ FadeInImage( backgroundImage, opacity, 0 );
- // Notifies the painter the button has been toggled.
- GetPushButtonPainter( mPainter )->Toggled( handle );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
- // Emit signal.
- mStateChangedSignal.Emit( handle, mToggled );
+ if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
+ {
+ mPaintState = DisabledSelectedTransition;
+ }
+ else
+ {
+ mPaintState = SelectedState;
+ }
}
- else
+ break;
+ }
+ case DisabledSelectedTransition:
+ {
+ if( disabled )
{
- Toolkit::PushButton handle( GetOwner() );
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
+ {
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation( false );
+ StopFadeInAnimation();
+
+ FadeOutImage( Foreground, selectedImage, 1.f - opacity );
+ FadeOutImage( Background, backgroundImage, 1.f - opacity );
+ FadeInImage( disabledImage, opacity, 0 );
+ FadeInImage( disabledBackgroundImage, opacity, 0 );
- // Notifies the painter the button has been clicked.
- GetPushButtonPainter( mPainter )->Released( handle );
- GetPushButtonPainter( mPainter )->Clicked( handle );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
- if( mAutoRepeating )
+ if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
{
- mAutoRepeatingTimer.Reset();
+ mPaintState = SelectedDisabledTransition;
+ }
+ else
+ {
+ mPaintState = DisabledSelectedState;
}
-
- //Emit signal.
- mReleasedSignal.Emit( handle );
- mClickedSignal.Emit( handle );
}
+ break;
+ }
+ default:
+ break;
}
}
-void PushButton::OnTouchPointLeave()
+void PushButton::OnPressed()
{
- if( ButtonDown == mState )
+ Actor& selectedImage = GetSelectedImage();
+ Actor& buttonImage = GetButtonImage();
+ Actor& fadeOutButtonImage = GetFadeOutButtonImage();
+
+ switch( mPaintState )
{
- if( !mToggleButton )
+ case UnselectedState:
{
- Toolkit::PushButton handle( GetOwner() );
-
- // Notifies the painter the button has been released.
- GetPushButtonPainter( mPainter )->Released( handle );
+ StopFadeOutAnimation();
+ FadeOutImage( Foreground, buttonImage );
+ FadeInImage( selectedImage, 0.0f, 0 );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
- if( mAutoRepeating )
+ if( buttonImage || selectedImage )
{
- mAutoRepeatingTimer.Reset();
+ mPaintState = UnselectedSelectedTransition;
}
-
- //Emit signal.
- mReleasedSignal.Emit( handle );
+ else
+ {
+ mPaintState = SelectedState;
+ }
+ break;
}
- }
-}
+ case UnselectedSelectedTransition:
+ {
+ if( !IsAutoRepeating() )
+ {
+ mPaintState = SelectedUnselectedTransition;
+ }
+ break;
+ }
+ case SelectedUnselectedTransition:
+ {
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
+ {
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation( false );
+ StopFadeInAnimation();
-void PushButton::OnTouchPointInterrupted()
-{
- OnTouchPointLeave();
-}
+ FadeOutImage( Foreground, buttonImage, 1.f - opacity );
+ FadeInImage( selectedImage, opacity, 0 );
-void PushButton::OnAnimationTimeSet( float animationTime )
-{
- GetPushButtonPainter( mPainter )->SetAnimationTime( animationTime );
-}
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
-float PushButton::OnAnimationTimeRequested() const
-{
- return GetPushButtonPainter( mPainter )->GetAnimationTime();
+ if( buttonImage || selectedImage )
+ {
+ mPaintState = UnselectedSelectedTransition;
+ }
+ else
+ {
+ mPaintState = SelectedState;
+ }
+ break;
+ }
+ default:
+ break;
+ }
}
-void PushButton::OnButtonStageDisconnection()
+void PushButton::OnReleased()
{
- if( ButtonDown == mState )
+ Actor& selectedImage = GetSelectedImage();
+ Actor& buttonImage = GetButtonImage();
+ Actor& fadeOutButtonImage = GetFadeOutButtonImage();
+
+ switch( mPaintState )
{
- if( !mToggleButton )
+ case SelectedState:
{
- Toolkit::PushButton handle( GetOwner() );
+ StopFadeOutAnimation();
+ FadeOutImage( Foreground, selectedImage );
+ FadeInImage( buttonImage, 0.0f, 0 );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
- // Notifies the painter the button has been released.
- GetPushButtonPainter( mPainter )->Released( handle );
-
- if( mAutoRepeating )
+ if( buttonImage || selectedImage )
+ {
+ mPaintState = SelectedUnselectedTransition;
+ }
+ else
{
- mAutoRepeatingTimer.Reset();
+ mPaintState = UnselectedState;
}
+ break;
}
- }
-}
+ case UnselectedSelectedTransition:
+ {
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
+ {
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation( false );
+ StopFadeInAnimation();
-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() );
-}
+ FadeOutImage( Foreground, selectedImage, 1.f - opacity );
+ FadeInImage( buttonImage, opacity, 0 );
-PushButton::~PushButton()
-{
- if( mAutoRepeatingTimer )
- {
- mAutoRepeatingTimer.Reset();
- }
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
- mPainter = NULL;
+ if( buttonImage || selectedImage )
+ {
+ mPaintState = SelectedUnselectedTransition;
+ }
+ else
+ {
+ mPaintState = UnselectedState;
+ }
+ break;
+ }
+ default:
+ {
+ break;
+ }
+ }
}
-void PushButton::SetUpTimer( float delay )
+void PushButton::OnClicked()
{
- mAutoRepeatingTimer = Dali::Timer::New( static_cast<unsigned int>( 1000.f * delay ) );
- mAutoRepeatingTimer.TickSignal().Connect( this, &PushButton::AutoRepeatingSlot );
- mAutoRepeatingTimer.Start();
+ OnReleased();
}
-bool PushButton::AutoRepeatingSlot()
+void PushButton::OnControlSizeSet( const Vector3& targetSize )
{
- bool consumed = false;
- if( !mDisabled )
+ if( targetSize != mSize )
{
- // Restart the autorepeat timer.
- SetUpTimer( mNextAutoRepeatingDelay );
+ mSize = targetSize;
- Toolkit::PushButton handle( GetOwner() );
+ Actor& label = GetLabel();
- // Notifies the painter the button has been pressed.
- GetPushButtonPainter( mPainter )->Pressed( handle );
-
- //Emit signal.
- consumed = mReleasedSignal.Emit( handle );
- consumed |= mClickedSignal.Emit( handle );
- consumed |= mPressedSignal.Emit( handle );
- }
-
- return consumed;
-}
-
-void PushButton::OnActivated()
-{
- // When the button is activated, it performs the click action
- PropertyValueContainer attributes;
- DoClickAction(attributes);
+ if( label )
+ {
+ label.SetSize( mSize );
+ }
+ }
}
Vector3 PushButton::GetNaturalSize()
if( widthIsZero || heightIsZero )
{
// If background and background not scale9 try get size from that
- ImageActor imageActor = FindImageActor( mButtonImage );
+ ImageActor imageActor = FindImageActor( GetButtonImage() );
if( imageActor && imageActor.GetStyle() != ImageActor::STYLE_NINE_PATCH )
{
- Vector3 imageSize = RelayoutHelper::GetNaturalSize( imageActor );
+ Vector3 imageSize = imageActor.GetNaturalSize();
if( widthIsZero )
{
}
}
- ImageActor backgroundImageActor = FindImageActor( mBackgroundImage );
+ ImageActor backgroundImageActor = FindImageActor( GetBackgroundImage() );
if( backgroundImageActor && backgroundImageActor.GetStyle() != ImageActor::STYLE_NINE_PATCH )
{
- Vector3 imageSize = RelayoutHelper::GetNaturalSize( backgroundImageActor );
+ Vector3 imageSize = backgroundImageActor.GetNaturalSize();
if( widthIsZero )
{
size.height = std::max( size.height, imageSize.height );
}
}
+
+ // If label, test against it's size
+ Toolkit::TextLabel textLabel = Toolkit::TextLabel::DownCast( GetLabel() );
+ if( textLabel )
+ {
+ Vector3 textLabelSize = textLabel.GetNaturalSize();
+
+ if( widthIsZero )
+ {
+ size.width = std::max( size.width, textLabelSize.width + TEXT_PADDING * 2.0f );
+ }
+
+ if( heightIsZero )
+ {
+ size.height = std::max( size.height, textLabelSize.height + TEXT_PADDING * 2.0f );
+ }
+ }
}
return size;
}
-void PushButton::DoClickAction(const PropertyValueContainer& attributes)
+Actor& PushButton::GetFadeOutButtonImage()
+{
+ return mFadeOutButtonContent;
+}
+
+Actor& PushButton::GetFadeOutBackgroundImage()
+{
+ return mFadeOutBackgroundContent;
+}
+
+void PushButton::AddToFadeInAnimation( const Actor& actor )
+{
+ if( !mFadeInAnimation )
+ {
+ mFadeInAnimation = Dali::Animation::New( GetAnimationTime() );
+ }
+
+ mFadeInAnimation.OpacityTo( actor, 1.f );
+}
+
+void PushButton::StartFadeInAnimation()
+{
+ if( mFadeInAnimation )
+ {
+ mFadeInAnimation.FinishedSignal().Connect( this, &PushButton::FadeInAnimationFinished );
+ mFadeInAnimation.Play();
+ }
+}
+
+void PushButton::StopFadeInAnimation()
+{
+ if( mFadeInAnimation )
+ {
+ mFadeInAnimation.Clear();
+ mFadeInAnimation.Reset();
+ }
+}
+
+void PushButton::AddToFadeOutAnimation( const Actor& actor )
+{
+ if( !mFadeOutAnimation )
+ {
+ mFadeOutAnimation = Dali::Animation::New( GetAnimationTime() );
+ }
+
+ mFadeOutAnimation.OpacityTo( actor, 0.f );
+}
+
+void PushButton::StartFadeOutAnimation()
+{
+ if( mFadeOutAnimation )
+ {
+ mFadeOutAnimation.FinishedSignal().Connect( this, &PushButton::FadeOutAnimationFinished );
+ mFadeOutAnimation.Play();
+ }
+}
+
+void PushButton::StopFadeOutAnimation( bool remove )
{
- // Prevents the button signals from doing a recursive loop by sending an action
- // and re-emitting the signals.
- if(!mClickActionPerforming)
+ if( mFadeOutAnimation )
+ {
+ mFadeOutAnimation.Clear();
+ mFadeOutAnimation.Reset();
+ }
+
+ if( remove )
{
- mClickActionPerforming = true;
- OnButtonDown();
- mState = ButtonDown;
- OnButtonUp();
- mClickActionPerforming = false;
+ Actor& fadeOutButtonImage = GetFadeOutButtonImage();
+ Actor& fadeOutBackgroundImage = GetFadeOutBackgroundImage();
+
+ if( fadeOutButtonImage && fadeOutButtonImage.GetParent() )
+ {
+ fadeOutButtonImage.GetParent().Remove( fadeOutButtonImage );
+ }
+
+ if( fadeOutBackgroundImage && fadeOutBackgroundImage.GetParent() )
+ {
+ fadeOutBackgroundImage.GetParent().Remove( fadeOutBackgroundImage );
+ }
+
+ fadeOutButtonImage.Reset();
+ fadeOutBackgroundImage.Reset();
}
}
-bool PushButton::DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes)
+void PushButton::FadeInImage( Actor& image, float opacity, int priority )
{
- bool ret = false;
+ if( image )
+ {
+ image.SetOpacity( opacity );
+ if( !image.GetParent() )
+ {
+ if( priority > -1 )
+ {
+ Self().Insert( priority, image );
+ }
+ else
+ {
+ Self().Add( image );
+ }
+ }
+
+ AddToFadeInAnimation( image );
+ }
+}
- Dali::BaseHandle handle(object);
+void PushButton::FadeOutImage( ImageLayer layer, Actor& image, float opacity )
+{
+ if( image )
+ {
+ Actor& fadeOutButtonImage = GetFadeOutButtonImage();
+ Actor& fadeOutBackgroundImage = GetFadeOutBackgroundImage();
- Toolkit::PushButton button = Toolkit::PushButton::DownCast(handle);
+ Actor& actorLayer = ( ( Background == layer ) ? fadeOutBackgroundImage : fadeOutButtonImage );
- DALI_ASSERT_ALWAYS(button);
+ actorLayer = image;
+ actorLayer.SetOpacity( opacity );
- if(Toolkit::PushButton::ACTION_PUSH_BUTTON_CLICK == actionName)
+ AddToFadeOutAnimation( actorLayer );
+ }
+}
+
+void PushButton::FadeOutAnimationFinished( Dali::Animation& source )
+{
+ switch( mPaintState )
{
- GetImplementation(button).DoClickAction(attributes);
- ret = true;
+ case UnselectedSelectedTransition:
+ {
+ mPaintState = SelectedState;
+ break;
+ }
+ case SelectedUnselectedTransition:
+ {
+ mPaintState = UnselectedState;
+ break;
+ }
+ case UnselectedDisabledTransition:
+ {
+ mPaintState = DisabledUnselectedState;
+ break;
+ }
+ case DisabledUnselectedTransition:
+ {
+ mPaintState = UnselectedState;
+ break;
+ }
+ case SelectedDisabledTransition:
+ {
+ mPaintState = DisabledSelectedState;
+ break;
+ }
+ case DisabledSelectedTransition:
+ {
+ mPaintState = SelectedState;
+ break;
+ }
+ default:
+ {
+ break;
+ }
+ }
+
+ StopFadeOutAnimation();
+}
+
+void PushButton::FadeInAnimationFinished( Dali::Animation& source )
+{
+ switch( mPaintState )
+ {
+ case UnselectedSelectedTransition:
+ {
+ mPaintState = SelectedState;
+ break;
+ }
+ case SelectedUnselectedTransition:
+ {
+ mPaintState = UnselectedState;
+ break;
+ }
+ case UnselectedDisabledTransition:
+ {
+ mPaintState = DisabledUnselectedState;
+ break;
+ }
+ case DisabledUnselectedTransition:
+ {
+ mPaintState = UnselectedState;
+ break;
+ }
+ case SelectedDisabledTransition:
+ {
+ mPaintState = DisabledSelectedState;
+ break;
+ }
+ case DisabledSelectedTransition:
+ {
+ mPaintState = SelectedState;
+ break;
+ }
+ default:
+ {
+ break;
+ }
}
- return ret;
+ StopFadeInAnimation();
}
} // namespace Internal
projects / platform / core / uifw / dali-toolkit.git / blobdiff