-//
-// 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) 2014 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 <algorithm>
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/object/type-registry.h>
// INTERNAL INCLUDES
-
-#include "push-button-default-painter-impl.h"
-
#include <dali-toolkit/public-api/controls/text-view/text-view.h>
+#include <dali-toolkit/internal/controls/relayout-helper.h>
namespace Dali
{
namespace Toolkit
{
-const Property::Index PushButton::PROPERTY_AUTO_REPEATING = Internal::Button::BUTTON_PROPERTY_END_INDEX + 1;
-const Property::Index PushButton::PROPERTY_INITIAL_AUTO_REPEATING_DELAY = Internal::Button::BUTTON_PROPERTY_END_INDEX + 2;
-const Property::Index PushButton::PROPERTY_NEXT_AUTO_REPEATING_DELAY = Internal::Button::BUTTON_PROPERTY_END_INDEX + 3;
-const Property::Index PushButton::PROPERTY_TOGGLABLE = Internal::Button::BUTTON_PROPERTY_END_INDEX + 4;
-const Property::Index PushButton::PROPERTY_TOGGLE = Internal::Button::BUTTON_PROPERTY_END_INDEX + 5;
-const Property::Index PushButton::PROPERTY_BUTTON_IMAGE = Internal::Button::BUTTON_PROPERTY_END_INDEX + 6;
-const Property::Index PushButton::PROPERTY_PRESSED_IMAGE = Internal::Button::BUTTON_PROPERTY_END_INDEX + 8;
-const Property::Index PushButton::PROPERTY_DIMMED_IMAGE = Internal::Button::BUTTON_PROPERTY_END_INDEX + 9;
-const Property::Index PushButton::PROPERTY_LABEL_TEXT = Internal::Button::BUTTON_PROPERTY_END_INDEX + 11;
-
namespace Internal
{
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_TOGGLED , &PushButton::DoConnectSignal );
-SignalConnectorType signalConnector2( typeRegistration, Toolkit::PushButton::SIGNAL_PRESSED , &PushButton::DoConnectSignal );
-SignalConnectorType signalConnector3( typeRegistration, Toolkit::PushButton::SIGNAL_RELEASED, &PushButton::DoConnectSignal );
-
-TypeAction action1( typeRegistration, Toolkit::PushButton::ACTION_PUSH_BUTTON_CLICK, &PushButton::DoAction );
-
-PropertyRegistration property1( typeRegistration, "auto-repeating", Toolkit::PushButton::PROPERTY_AUTO_REPEATING, Property::BOOLEAN, &PushButton::SetProperty, &PushButton::GetProperty );
-PropertyRegistration property2( typeRegistration, "initial-auto-repeating-delay", Toolkit::PushButton::PROPERTY_INITIAL_AUTO_REPEATING_DELAY, Property::FLOAT, &PushButton::SetProperty, &PushButton::GetProperty );
-PropertyRegistration property3( typeRegistration, "next-auto-repeating-delay", Toolkit::PushButton::PROPERTY_NEXT_AUTO_REPEATING_DELAY, Property::FLOAT, &PushButton::SetProperty, &PushButton::GetProperty );
-PropertyRegistration property4( typeRegistration, "togglable", Toolkit::PushButton::PROPERTY_TOGGLABLE, Property::BOOLEAN, &PushButton::SetProperty, &PushButton::GetProperty );
-PropertyRegistration property5( typeRegistration, "toggle", Toolkit::PushButton::PROPERTY_TOGGLE, Property::BOOLEAN, &PushButton::SetProperty, &PushButton::GetProperty );
-PropertyRegistration property6( typeRegistration, "button-image", Toolkit::PushButton::PROPERTY_BUTTON_IMAGE, Property::STRING, &PushButton::SetProperty, &PushButton::GetProperty );
-PropertyRegistration property7( typeRegistration, "pressed-image", Toolkit::PushButton::PROPERTY_PRESSED_IMAGE, Property::STRING, &PushButton::SetProperty, &PushButton::GetProperty );
-PropertyRegistration property8( typeRegistration, "dimmed-image", Toolkit::PushButton::PROPERTY_DIMMED_IMAGE, Property::STRING, &PushButton::SetProperty, &PushButton::GetProperty );
-PropertyRegistration property9( typeRegistration, "label-text", Toolkit::PushButton::PROPERTY_LABEL_TEXT, Property::STRING, &PushButton::SetProperty, &PushButton::GetProperty );
-
} // 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<PushButtonDefaultPainter*>( painter.Get() );
-}
-
/**
- * Helper function to checks if the specified actor is an ImageActor and if it has an Image with a path.
- *
- * @param[in] actor Actor handle to check.
- * @param[out] path The image path will be applied to this parameter, if available.
- * If not available then this will be an empty string.
+ * Find the first image actor in the actor hierarchy
*/
-void GetImageActorFilename( Actor& actor, std::string& path )
+ImageActor FindImageActor( Actor root )
{
- path = ""; // Just return an empty string if not using ImageActor with an image
-
- if ( actor )
+ ImageActor imageActor = ImageActor::DownCast( root );
+ if( !imageActor && root )
{
- ImageActor imageActor = ImageActor::DownCast( actor );
- if ( imageActor )
+ for( unsigned int i = 0, numChildren = root.GetChildCount(); i < numChildren; ++i )
{
- Image image = imageActor.GetImage();
- if ( image )
+ ImageActor childImageActor = FindImageActor( root.GetChildAt( i ) );
+ if( childImageActor )
{
- path = image.GetFilename();
+ return childImageActor;
}
}
}
+
+ return imageActor;
}
} // unnamed namespace
return pushButton;
}
-void PushButton::SetAutoRepeating( bool autoRepeating )
+PushButton::PushButton()
+: Button(),
+ mSize(),
+ mPaintState( UnselectedState )
{
- mAutoRepeating = autoRepeating;
+ SetAnimationTime( ANIMATION_TIME );
+}
- // An autorepeating button can't be a toggle button.
- if( autoRepeating )
+PushButton::~PushButton()
+{
+}
+
+void PushButton::SetButtonImage( Actor image )
+{
+ Actor& buttonImage = GetButtonImage();
+ Actor& fadeOutButtonImage = GetFadeOutButtonImage();
+
+ 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 );
+
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+ }
+ else
+ {
+ buttonImage = image;
+ Self().Add( 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().Add( 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 );
+ 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.SetSizeMode( SIZE_EQUAL_TO_PARENT );
}
-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 );
- // Notifies the painter.
- GetPushButtonPainter( mPainter )->SetAutoRepeating( mAutoRepeating );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+ }
+ else
+ {
+ selectedImage = image;
+ Self().Add( selectedImage );
+ }
+ break;
+ }
+ case SelectedUnselectedTransition: // FALLTHROUGH
+ case SelectedDisabledTransition:
+ {
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
+ {
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation();
+
+ // Replaces the button image.
+ selectedImage = image;
+
+ Self().Add( selectedImage );
+ FadeOutImage( Foreground, selectedImage, opacity );
+
+ StartFadeOutAnimation();
+ break;
+ }
+ case UnselectedSelectedTransition: // FALLTHROUGH
+ case DisabledSelectedTransition:
+ {
+ StopFadeInAnimation();
+ Self().Remove( selectedImage );
+
+ selectedImage = image;
+
+ FadeInImage( selectedImage );
+ 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.SetSizeMode( SIZE_EQUAL_TO_PARENT );
}
-void PushButton::SetToggled( bool toggle )
+void PushButton::SetBackgroundImage( Actor image )
{
- if( !mDimmed && 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 );
- // Emit signal.
- mToggledSignalV2.Emit( handle, mToggled );
- }
-}
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+ }
+ else
+ {
+ backgroundImage = image;
+ Self().Add( 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().Add( 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 );
+ 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.SetSizeMode( SIZE_EQUAL_TO_PARENT );
}
-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::SetPressedImage( Image image )
-{
- SetPressedImage( ImageActor::New( image ) );
-}
+ FadeInImage( disabledImage );
-void PushButton::SetPressedImage( Actor image )
-{
- Toolkit::PushButton handle( GetOwner() );
- GetPushButtonPainter( mPainter )->SetPressedImage( handle, image );
-}
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+ }
+ else
+ {
+ disabledImage = image;
+ Self().Add( disabledImage );
+ }
+ break;
+ }
+ case UnselectedDisabledTransition: // FALLTHROUGH
+ case SelectedDisabledTransition:
+ {
+ StopFadeInAnimation();
+ Self().Remove( disabledImage );
-Actor& PushButton::GetPressedImage()
-{
- return mPressedImage;
-}
+ disabledImage = image;
-Actor PushButton::GetPressedImage() const
-{
- return mPressedImage;
-}
+ FadeInImage( disabledImage );
+ StartFadeInAnimation();
+ break;
+ }
+ case DisabledUnselectedTransition: // FALLTHROUGH
+ case DisabledSelectedTransition:
+ {
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
+ {
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation();
-void PushButton::SetDimmedBackgroundImage( Image image )
-{
- SetDimmedBackgroundImage( ImageActor::New( image ) );
-}
+ // Replaces the button image.
+ disabledImage = image;
-void PushButton::SetDimmedBackgroundImage( Actor image )
-{
- Toolkit::PushButton handle( GetOwner() );
- GetPushButtonPainter( mPainter )->SetDimmedBackgroundImage( handle, image );
-}
+ Self().Add( disabledImage );
+ FadeOutImage( Foreground, disabledImage, opacity );
-Actor& PushButton::GetDimmedBackgroundImage()
-{
- return mDimmedBackgroundImage;
-}
+ StartFadeOutAnimation();
+ break;
+ }
+ default:
+ disabledImage = image;
+ break;
+ }
-Actor PushButton::GetDimmedBackgroundImage() const
-{
- return mDimmedBackgroundImage;
+ disabledImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+ disabledImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ disabledImage.SetPosition( 0.f, 0.f, FOREGROUND_DEPTH );
+ disabledImage.SetSizeMode( SIZE_EQUAL_TO_PARENT );
}
-void PushButton::SetDimmedImage( Image image )
+void PushButton::SetDisabledBackgroundImage( Actor image )
{
- SetDimmedImage( ImageActor::New( image ) );
-}
+ Actor& disabledBackgroundImage = GetDisabledBackgroundImage();
+ Actor& fadeOutBackgroundImage = GetFadeOutBackgroundImage();
-void PushButton::SetDimmedImage( Actor image )
-{
- Toolkit::PushButton handle( GetOwner() );
- GetPushButtonPainter( mPainter )->SetDimmedImage( handle, image );
-}
+ switch( mPaintState )
+ {
+ case DisabledUnselectedState: // FALLTHROUGH
+ case DisabledSelectedState:
+ {
+ if( disabledBackgroundImage && disabledBackgroundImage.GetParent() )
+ {
+ StopFadeOutAnimation();
+ FadeOutImage( Background, disabledBackgroundImage );
-Actor& PushButton::GetDimmedImage()
-{
- return mDimmedImage;
-}
+ disabledBackgroundImage = image;
-Actor PushButton::GetDimmedImage() const
-{
- return mDimmedImage;
-}
+ FadeInImage( disabledBackgroundImage );
-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 );
-}
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+ }
+ else
+ {
+ disabledBackgroundImage = image;
+ Self().Add( disabledBackgroundImage );
+ }
+ break;
+ }
+ case UnselectedDisabledTransition: // FALLTHROUGH
+ case SelectedDisabledTransition:
+ {
+ StopFadeInAnimation();
+ Self().Remove( disabledBackgroundImage );
-void PushButton::SetLabelText( Actor text )
-{
- Toolkit::PushButton handle( GetOwner() );
- GetPushButtonPainter( mPainter )->SetLabelText( handle, text );
-}
+ disabledBackgroundImage = image;
-Actor& PushButton::GetLabel()
-{
- return mLabel;
-}
+ FadeInImage( disabledBackgroundImage );
+ StartFadeInAnimation();
+ break;
+ }
+ case DisabledUnselectedTransition: // FALLTHROUGH
+ case DisabledSelectedTransition:
+ {
+ float opacity = 1.f;
+ if( fadeOutBackgroundImage )
+ {
+ opacity = fadeOutBackgroundImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation();
-Actor PushButton::GetLabelText() const
-{
- 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;
+ }
+
+ disabledBackgroundImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+ disabledBackgroundImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ disabledBackgroundImage.SetPosition( 0.f, 0.f, BACKGROUND_DEPTH );
+ disabledBackgroundImage.SetSizeMode( SIZE_EQUAL_TO_PARENT );
}
-Toolkit::PushButton::ToggledSignalV2& PushButton::ToggledSignal()
+void PushButton::OnButtonInitialize()
{
- return mToggledSignalV2;
+ // Push button requires the Leave event.
+ Actor root = Self();
+ root.SetLeaveRequired( true );
}
-Toolkit::PushButton::PressedSignalV2& PushButton::PressedSignal()
+void PushButton::OnLabelSet()
{
- return mPressedSignalV2;
+ Actor& label = GetLabel();
+
+ if( label )
+ {
+ label.SetAnchorPoint( AnchorPoint::CENTER );
+ label.SetParentOrigin( ParentOrigin::CENTER );
+ label.SetPosition( 0.f, 0.f, LABEL_DEPTH );
+ label.SetSize( mSize );
+
+ Self().Add( label );
+ }
}
-Toolkit::PushButton::ReleasedSignalV2& PushButton::ReleasedSignal()
+void PushButton::OnSelected( bool selected )
{
- return mReleasedSignalV2;
+ Actor& selectedImage = GetSelectedImage();
+ Actor& buttonImage = GetButtonImage();
+ Actor& fadeOutButtonImage = GetFadeOutButtonImage();
+
+ switch( mPaintState )
+ {
+ case UnselectedState:
+ {
+ StopFadeOutAnimation();
+ FadeOutImage( Foreground, buttonImage );
+ FadeInImage( selectedImage );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( buttonImage || selectedImage )
+ {
+ mPaintState = UnselectedSelectedTransition;
+ }
+ else
+ {
+ mPaintState = SelectedState;
+ }
+ break;
+ }
+ case SelectedState:
+ {
+ StopFadeOutAnimation();
+ FadeOutImage( Foreground, selectedImage );
+ FadeInImage( buttonImage );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( buttonImage || selectedImage )
+ {
+ mPaintState = SelectedUnselectedTransition;
+ }
+ else
+ {
+ mPaintState = UnselectedState;
+ }
+ break;
+ }
+ case UnselectedSelectedTransition:
+ {
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
+ {
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation( false );
+ StopFadeInAnimation();
+
+ FadeOutImage( Foreground, selectedImage, 1.f - opacity );
+ FadeInImage( buttonImage, opacity );
+
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( buttonImage || selectedImage )
+ {
+ mPaintState = SelectedUnselectedTransition;
+ }
+ else
+ {
+ mPaintState = UnselectedState;
+ }
+ break;
+ }
+ case SelectedUnselectedTransition:
+ {
+ float opacity = 0.f;
+ if( fadeOutButtonImage )
+ {
+ opacity = 1.f - fadeOutButtonImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation( false );
+ StopFadeInAnimation();
+
+ FadeOutImage( Foreground, buttonImage, 1.f - opacity );
+ FadeInImage( selectedImage, opacity );
+
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( buttonImage || selectedImage )
+ {
+ mPaintState = UnselectedSelectedTransition;
+ }
+ else
+ {
+ mPaintState = SelectedState;
+ }
+ break;
+ }
+ default:
+ {
+ break;
+ }
+ }
}
-bool PushButton::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
+void PushButton::OnDisabled( bool disabled )
{
- Dali::BaseHandle handle( object );
-
- bool connected( true );
- Toolkit::PushButton button = Toolkit::PushButton::DownCast(handle);
+ Actor& buttonImage = GetButtonImage();
+ Actor& selectedImage = GetSelectedImage();
+ Actor& backgroundImage = GetBackgroundImage();
+ Actor& disabledImage = GetDisabledImage();
+ Actor& disabledBackgroundImage = GetDisabledBackgroundImage();
+ Actor& fadeOutButtonImage = GetFadeOutButtonImage();
- if( Toolkit::PushButton::SIGNAL_TOGGLED == signalName )
+ switch( mPaintState )
{
- button.ToggledSignal().Connect( tracker, functor );
+ case UnselectedState:
+ {
+ if( disabled )
+ {
+ StopFadeOutAnimation();
+ FadeOutImage( Background, backgroundImage );
+ FadeOutImage( Foreground, buttonImage );
+ FadeInImage( disabledBackgroundImage );
+ FadeInImage( disabledImage );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
+ {
+ mPaintState = UnselectedDisabledTransition;
+ }
+ else
+ {
+ mPaintState = DisabledUnselectedState;
+ }
+ }
+ break;
}
- else if( Toolkit::PushButton::SIGNAL_PRESSED == signalName )
+ case SelectedState:
{
- button.PressedSignal().Connect( tracker, functor );
+ if( disabled )
+ {
+ StopFadeOutAnimation();
+ FadeOutImage( Background, backgroundImage );
+ FadeOutImage( Foreground, selectedImage );
+ FadeInImage( disabledBackgroundImage );
+ FadeInImage( disabledImage );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
+ {
+ mPaintState = SelectedDisabledTransition;
+ }
+ else
+ {
+ mPaintState = DisabledSelectedState;
+ }
+ }
+ break;
}
- else if( Toolkit::PushButton::SIGNAL_RELEASED == signalName )
+ case DisabledUnselectedState:
{
- button.ReleasedSignal().Connect( tracker, functor );
+ if( !disabled )
+ {
+ StopFadeOutAnimation();
+ FadeOutImage( Background, disabledBackgroundImage );
+ FadeOutImage( Foreground, disabledImage );
+ FadeInImage( backgroundImage );
+ FadeInImage( buttonImage );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
+ {
+ mPaintState = DisabledUnselectedTransition;
+ }
+ else
+ {
+ mPaintState = UnselectedState;
+ }
+ }
+ break;
}
- else
+ case DisabledSelectedState:
{
- // signalName does not match any signal
- connected = false;
+ if( !disabled )
+ {
+ StopFadeOutAnimation();
+ FadeOutImage( Background, disabledBackgroundImage );
+ FadeOutImage( Foreground, disabledImage );
+ FadeInImage( backgroundImage );
+ FadeInImage( selectedImage );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
+ {
+ mPaintState = DisabledSelectedTransition;
+ }
+ else
+ {
+ mPaintState = SelectedState;
+ }
+ }
+ break;
}
+ case UnselectedSelectedTransition:
+ {
+ if( disabled )
+ {
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
+ {
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation();
+ StopFadeInAnimation();
- return connected;
-}
+ FadeOutImage( Foreground, selectedImage, 1.f - opacity );
+ FadeOutImage( Background, backgroundImage );
-void PushButton::SetProperty( BaseObject* object, Property::Index propertyIndex, const Property::Value& value )
-{
- Toolkit::PushButton pushButton = Toolkit::PushButton::DownCast( Dali::BaseHandle( object ) );
+ FadeInImage( disabledImage );
+ FadeInImage( disabledBackgroundImage );
- if ( pushButton )
- {
- PushButton& pushButtonImpl( GetImplementation( pushButton ) );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
- switch ( propertyIndex )
+ if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
+ {
+ mPaintState = SelectedDisabledTransition;
+ }
+ else
+ {
+ mPaintState = DisabledSelectedState;
+ }
+ }
+ break;
+ }
+ case SelectedUnselectedTransition:
+ {
+ if( disabled )
{
- case Toolkit::PushButton::PROPERTY_AUTO_REPEATING:
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
{
- pushButtonImpl.SetAutoRepeating( value.Get< bool >() );
- break;
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
}
+ StopFadeOutAnimation();
+ StopFadeInAnimation();
+
+ FadeOutImage( Foreground, buttonImage, 1.f - opacity );
+ FadeOutImage( Background, backgroundImage );
- case Toolkit::PushButton::PROPERTY_INITIAL_AUTO_REPEATING_DELAY:
+ FadeInImage( disabledImage );
+ FadeInImage( disabledBackgroundImage );
+
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
{
- pushButtonImpl.SetInitialAutoRepeatingDelay( value.Get< float >() );
- break;
+ mPaintState = UnselectedDisabledTransition;
}
-
- case Toolkit::PushButton::PROPERTY_NEXT_AUTO_REPEATING_DELAY:
+ else
{
- pushButtonImpl.SetNextAutoRepeatingDelay( value.Get< float >() );
- break;
+ mPaintState = DisabledUnselectedState;
}
-
- case Toolkit::PushButton::PROPERTY_TOGGLABLE:
+ }
+ break;
+ }
+ case UnselectedDisabledTransition:
+ {
+ if( !disabled )
+ {
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
{
- pushButtonImpl.SetToggleButton( value.Get< bool >() );
- break;
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
}
+ StopFadeOutAnimation( false );
+ StopFadeInAnimation();
+
+ FadeOutImage( Foreground, disabledImage, 1.f - opacity );
+ FadeOutImage( Background, disabledBackgroundImage, 1.f - opacity );
+ FadeInImage( buttonImage, opacity );
+ FadeInImage( backgroundImage, opacity );
+
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
- case Toolkit::PushButton::PROPERTY_TOGGLE:
+ if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
{
- pushButtonImpl.SetToggled( value.Get< bool >() );
- break;
+ mPaintState = DisabledUnselectedTransition;
}
-
- case Toolkit::PushButton::PROPERTY_BUTTON_IMAGE:
+ else
+ {
+ mPaintState = UnselectedState;
+ }
+ }
+ break;
+ }
+ case DisabledUnselectedTransition:
+ {
+ if( disabled )
+ {
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
{
- Image image = Image::New( value.Get<std::string>() );
- pushButtonImpl.SetButtonImage( image );
- break;
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
}
+ StopFadeOutAnimation( false );
+ StopFadeInAnimation();
- case Toolkit::PushButton::PROPERTY_PRESSED_IMAGE:
+ FadeOutImage( Foreground, buttonImage, 1.f - opacity );
+ FadeOutImage( Background, backgroundImage, 1.f - opacity );
+ FadeInImage( disabledImage, opacity );
+ FadeInImage( disabledBackgroundImage, opacity );
+
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
+ {
+ mPaintState = UnselectedDisabledTransition;
+ }
+ else
{
- Image image = Image::New( value.Get<std::string>() );
- pushButtonImpl.SetPressedImage( image );
- break;
+ mPaintState = DisabledUnselectedState;
}
+ }
+ break;
+ }
+ case SelectedDisabledTransition:
+ {
+ if( !disabled )
+ {
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
+ {
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
+ }
+ StopFadeOutAnimation( false );
+ StopFadeInAnimation();
- case Toolkit::PushButton::PROPERTY_DIMMED_IMAGE:
+ FadeOutImage( Foreground, disabledImage, 1.f - opacity );
+ FadeOutImage( Background, disabledBackgroundImage, 1.f - opacity );
+ FadeInImage( selectedImage, opacity );
+ FadeInImage( backgroundImage, opacity );
+
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
+ {
+ mPaintState = DisabledSelectedTransition;
+ }
+ else
+ {
+ mPaintState = SelectedState;
+ }
+ }
+ break;
+ }
+ case DisabledSelectedTransition:
+ {
+ if( disabled )
+ {
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
{
- Image image = Image::New( value.Get<std::string>() );
- pushButtonImpl.SetDimmedImage( image );
- break;
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
}
+ StopFadeOutAnimation( false );
+ StopFadeInAnimation();
- case Toolkit::PushButton::PROPERTY_LABEL_TEXT:
+ FadeOutImage( Foreground, selectedImage, 1.f - opacity );
+ FadeOutImage( Background, backgroundImage, 1.f - opacity );
+ FadeInImage( disabledImage, opacity );
+ FadeInImage( disabledBackgroundImage, opacity );
+
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
+ {
+ mPaintState = SelectedDisabledTransition;
+ }
+ else
{
- pushButtonImpl.SetLabelText( value.Get< std::string >() );
- break;
+ mPaintState = DisabledSelectedState;
}
}
+ break;
+ }
+ default:
+ break;
}
}
-Property::Value PushButton::GetProperty( BaseObject* object, Property::Index propertyIndex )
+void PushButton::OnPressed()
{
- Property::Value value;
-
- 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 ) );
+ case UnselectedState:
+ {
+ StopFadeOutAnimation();
+ FadeOutImage( Foreground, buttonImage );
+ FadeInImage( selectedImage );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
- switch ( propertyIndex )
+ if( buttonImage || selectedImage )
+ {
+ mPaintState = UnselectedSelectedTransition;
+ }
+ else
+ {
+ mPaintState = SelectedState;
+ }
+ break;
+ }
+ case UnselectedSelectedTransition:
{
- case Toolkit::PushButton::PROPERTY_AUTO_REPEATING:
+ if( !IsAutoRepeating() )
{
- value = pushButtonImpl.mAutoRepeating;
- break;
+ mPaintState = SelectedUnselectedTransition;
}
-
- case Toolkit::PushButton::PROPERTY_INITIAL_AUTO_REPEATING_DELAY:
+ break;
+ }
+ case SelectedUnselectedTransition:
+ {
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
{
- value = pushButtonImpl.mInitialAutoRepeatingDelay;
- break;
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
}
+ StopFadeOutAnimation( false );
+ StopFadeInAnimation();
+
+ FadeOutImage( Foreground, buttonImage, 1.f - opacity );
+ FadeInImage( selectedImage, opacity );
+
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
- case Toolkit::PushButton::PROPERTY_NEXT_AUTO_REPEATING_DELAY:
+ if( buttonImage || selectedImage )
{
- value = pushButtonImpl.mNextAutoRepeatingDelay;
- break;
+ mPaintState = UnselectedSelectedTransition;
}
-
- case Toolkit::PushButton::PROPERTY_TOGGLABLE:
+ else
{
- value = pushButtonImpl.mToggleButton;
- break;
+ mPaintState = SelectedState;
}
+ break;
+ }
+ default:
+ break;
+ }
+}
+
+void PushButton::OnReleased()
+{
+ Actor& selectedImage = GetSelectedImage();
+ Actor& buttonImage = GetButtonImage();
+ Actor& fadeOutButtonImage = GetFadeOutButtonImage();
- case Toolkit::PushButton::PROPERTY_TOGGLE:
+ switch( mPaintState )
+ {
+ case SelectedState:
+ {
+ StopFadeOutAnimation();
+ FadeOutImage( Foreground, selectedImage );
+ FadeInImage( buttonImage );
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( buttonImage || selectedImage )
{
- value = pushButtonImpl.mToggled;
- break;
+ mPaintState = SelectedUnselectedTransition;
}
-
- case Toolkit::PushButton::PROPERTY_BUTTON_IMAGE:
+ else
{
- std::string path;
- GetImageActorFilename( pushButtonImpl.mButtonImage, path );
- value = path;
- break;
+ mPaintState = UnselectedState;
}
-
- case Toolkit::PushButton::PROPERTY_PRESSED_IMAGE:
+ break;
+ }
+ case UnselectedSelectedTransition:
+ {
+ float opacity = 1.f;
+ if( fadeOutButtonImage )
{
- std::string path;
- GetImageActorFilename( pushButtonImpl.mPressedImage, path );
- value = path;
- break;
+ opacity = fadeOutButtonImage.GetCurrentOpacity();
}
+ StopFadeOutAnimation( false );
+ StopFadeInAnimation();
+
+ FadeOutImage( Foreground, selectedImage, 1.f - opacity );
+ FadeInImage( buttonImage, opacity );
- case Toolkit::PushButton::PROPERTY_DIMMED_IMAGE:
+ StartFadeOutAnimation();
+ StartFadeInAnimation();
+
+ if( buttonImage || selectedImage )
{
- std::string path;
- GetImageActorFilename( pushButtonImpl.mDimmedImage, path );
- value = path;
- break;
+ mPaintState = SelectedUnselectedTransition;
}
-
- case Toolkit::PushButton::PROPERTY_LABEL_TEXT:
+ else
{
- value = ""; // Just return an empty string if not using a TextView
-
- if ( pushButtonImpl.mLabel )
- {
- Toolkit::TextView textView = Toolkit::TextView::DownCast( pushButtonImpl.mLabel );
- if ( textView )
- {
- value = textView.GetText();
- }
- }
- break;
+ mPaintState = UnselectedState;
}
+ break;
+ }
+ default:
+ {
+ break;
}
}
-
- return value;
}
-void PushButton::OnButtonInitialize()
+void PushButton::OnClicked()
{
- // Push button requires the Leave event.
- Actor root = Self();
- root.SetLeaveRequired( true );
+ OnReleased();
}
-void PushButton::OnButtonDown()
+void PushButton::OnControlSizeSet( const Vector3& targetSize )
{
- if( !mToggleButton )
+ if( targetSize != mSize )
{
- Toolkit::PushButton handle( GetOwner() );
+ mSize = targetSize;
- // Notifies the painter the button has been pressed.
- GetPushButtonPainter( mPainter )->Pressed( handle );
+ Actor& label = GetLabel();
- if( mAutoRepeating )
+ if( label )
{
- SetUpTimer( mInitialAutoRepeatingDelay );
+ label.SetSize( mSize );
}
-
- //Emit signal.
- mPressedSignalV2.Emit( handle );
}
}
-void PushButton::OnButtonUp()
+Vector3 PushButton::GetNaturalSize()
{
- if( ButtonDown == mState )
+ Vector3 size = Control::GetNaturalSize();
+
+ const bool widthIsZero = EqualsZero( size.width );
+ const bool heightIsZero = EqualsZero( size.height );
+
+ if( widthIsZero || heightIsZero )
{
- if( mToggleButton )
+ // If background and background not scale9 try get size from that
+ ImageActor imageActor = FindImageActor( GetButtonImage() );
+ if( imageActor && imageActor.GetStyle() != ImageActor::STYLE_NINE_PATCH )
{
- mToggled = !mToggled;
+ Vector3 imageSize = RelayoutHelper::GetNaturalSize( imageActor );
- Toolkit::PushButton handle( GetOwner() );
-
- // Notifies the painter the button has been toggled.
- GetPushButtonPainter( mPainter )->Toggled( handle );
+ if( widthIsZero )
+ {
+ size.width = imageSize.width;
+ }
- //Emit signal.
- mToggledSignalV2.Emit( handle, mToggled );
+ if( heightIsZero )
+ {
+ size.height = imageSize.height;
+ }
}
- else
- {
- Toolkit::PushButton handle( GetOwner() );
- // Notifies the painter the button has been clicked.
- GetPushButtonPainter( mPainter )->Released( handle );
- GetPushButtonPainter( mPainter )->Clicked( handle );
+ ImageActor backgroundImageActor = FindImageActor( GetBackgroundImage() );
+ if( backgroundImageActor && backgroundImageActor.GetStyle() != ImageActor::STYLE_NINE_PATCH )
+ {
+ Vector3 imageSize = RelayoutHelper::GetNaturalSize( backgroundImageActor );
- if( mAutoRepeating )
+ if( widthIsZero )
{
- mAutoRepeatingTimer.Reset();
+ size.width = std::max( size.width, imageSize.width );
}
- //Emit signal.
- mReleasedSignalV2.Emit( handle );
- mClickedSignalV2.Emit( handle );
+ if( heightIsZero )
+ {
+ size.height = std::max( size.height, imageSize.height );
+ }
}
- }
-}
-void PushButton::OnTouchPointLeave()
-{
- if( ButtonDown == mState )
- {
- if( !mToggleButton )
+ // If label, test against it's size
+ Toolkit::TextView textView = Toolkit::TextView::DownCast( GetLabel() );
+ if( textView )
{
- Toolkit::PushButton handle( GetOwner() );
-
- // Notifies the painter the button has been released.
- GetPushButtonPainter( mPainter )->Released( handle );
+ Vector3 textViewSize = textView.GetNaturalSize();
- if( mAutoRepeating )
+ if( widthIsZero )
{
- mAutoRepeatingTimer.Reset();
+ size.width = std::max( size.width, textViewSize.width + TEXT_PADDING * 2.0f );
}
- //Emit signal.
- mReleasedSignalV2.Emit( handle );
+ if( heightIsZero )
+ {
+ size.height = std::max( size.height, textViewSize.height + TEXT_PADDING * 2.0f );
+ }
}
}
+
+ return size;
}
-void PushButton::OnTouchPointInterrupted()
+Actor& PushButton::GetFadeOutButtonImage()
{
- OnTouchPointLeave();
+ return mFadeOutButtonContent;
}
-void PushButton::OnAnimationTimeSet( float animationTime )
+Actor& PushButton::GetFadeOutBackgroundImage()
{
- GetPushButtonPainter( mPainter )->SetAnimationTime( animationTime );
+ return mFadeOutBackgroundContent;
}
-float PushButton::OnAnimationTimeRequested() const
+void PushButton::AddToFadeInAnimation( const Actor& actor )
{
- return GetPushButtonPainter( mPainter )->GetAnimationTime();
+ if( !mFadeInAnimation )
+ {
+ mFadeInAnimation = Dali::Animation::New( GetAnimationTime() );
+ }
+
+ mFadeInAnimation.OpacityTo( actor, 1.f );
}
-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() );
+void PushButton::StartFadeInAnimation()
+{
+ if( mFadeInAnimation )
+ {
+ mFadeInAnimation.FinishedSignal().Connect( this, &PushButton::FadeInAnimationFinished );
+ mFadeInAnimation.Play();
+ }
}
-PushButton::~PushButton()
+void PushButton::StopFadeInAnimation()
+{
+ if( mFadeInAnimation )
+ {
+ mFadeInAnimation.Clear();
+ mFadeInAnimation.Reset();
+ }
+}
+
+void PushButton::AddToFadeOutAnimation( const Actor& actor )
{
- if( mAutoRepeatingTimer )
+ if( !mFadeOutAnimation )
{
- mAutoRepeatingTimer.Reset();
+ mFadeOutAnimation = Dali::Animation::New( GetAnimationTime() );
}
- mPainter = NULL;
+ mFadeOutAnimation.OpacityTo( actor, 0.f );
}
-void PushButton::SetUpTimer( float delay )
+void PushButton::StartFadeOutAnimation()
{
- mAutoRepeatingTimer = Dali::Timer::New( static_cast<unsigned int>( 1000.f * delay ) );
- mAutoRepeatingTimer.TickSignal().Connect( this, &PushButton::AutoRepeatingSlot );
- mAutoRepeatingTimer.Start();
+ if( mFadeOutAnimation )
+ {
+ mFadeOutAnimation.FinishedSignal().Connect( this, &PushButton::FadeOutAnimationFinished );
+ mFadeOutAnimation.Play();
+ }
}
-bool PushButton::AutoRepeatingSlot()
+void PushButton::StopFadeOutAnimation( bool remove )
{
- bool consumed = false;
- if( !mDimmed )
+ if( mFadeOutAnimation )
{
- // Restart the autorepeat timer.
- SetUpTimer( mNextAutoRepeatingDelay );
+ mFadeOutAnimation.Clear();
+ mFadeOutAnimation.Reset();
+ }
- Toolkit::PushButton handle( GetOwner() );
+ if( remove )
+ {
+ Actor& fadeOutButtonImage = GetFadeOutButtonImage();
+ Actor& fadeOutBackgroundImage = GetFadeOutBackgroundImage();
- // Notifies the painter the button has been pressed.
- GetPushButtonPainter( mPainter )->Pressed( handle );
+ if( fadeOutButtonImage && fadeOutButtonImage.GetParent() )
+ {
+ fadeOutButtonImage.GetParent().Remove( fadeOutButtonImage );
+ }
- //Emit signal.
- consumed = mReleasedSignalV2.Emit( handle );
- consumed |= mClickedSignalV2.Emit( handle );
- consumed |= mPressedSignalV2.Emit( handle );
- }
+ if( fadeOutBackgroundImage && fadeOutBackgroundImage.GetParent() )
+ {
+ fadeOutBackgroundImage.GetParent().Remove( fadeOutBackgroundImage );
+ }
- return consumed;
+ fadeOutButtonImage.Reset();
+ fadeOutBackgroundImage.Reset();
+ }
}
-void PushButton::OnActivated()
+void PushButton::FadeInImage( Actor& image, float opacity )
{
- // When the button is activated, it performs the click action
- std::vector<Property::Value> attributes;
- DoClickAction(attributes);
+ if( image )
+ {
+ image.SetOpacity( opacity );
+ if( !image.GetParent() )
+ {
+ Self().Add( image );
+ }
+
+ AddToFadeInAnimation( image );
+ }
}
-void PushButton::DoClickAction(const PropertyValueContainer& attributes)
+void PushButton::FadeOutImage( ImageLayer layer, Actor& image, float opacity )
{
- // Prevents the button signals from doing a recursive loop by sending an action
- // and re-emitting the signals.
- if(!mClickActionPerforming)
+ if( image )
{
- mClickActionPerforming = true;
- OnButtonDown();
- mState = ButtonDown;
- OnButtonUp();
- mClickActionPerforming = false;
+ Actor& fadeOutButtonImage = GetFadeOutButtonImage();
+ Actor& fadeOutBackgroundImage = GetFadeOutBackgroundImage();
+
+ Actor& actorLayer = ( ( Background == layer ) ? fadeOutBackgroundImage : fadeOutButtonImage );
+
+ actorLayer = image;
+ actorLayer.SetOpacity( opacity );
+
+ AddToFadeOutAnimation( actorLayer );
}
}
-bool PushButton::DoAction(BaseObject* object, const std::string& actionName, const std::vector<Property::Value>& attributes)
+void PushButton::FadeOutAnimationFinished( Dali::Animation& source )
{
- bool ret = false;
-
- Dali::BaseHandle handle(object);
-
- Toolkit::PushButton button = Toolkit::PushButton::DownCast(handle);
+ 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;
+ }
+ }
- DALI_ASSERT_ALWAYS(button);
+ StopFadeOutAnimation();
+}
- if(Toolkit::PushButton::ACTION_PUSH_BUTTON_CLICK == actionName)
+void PushButton::FadeInAnimationFinished( 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;
+ }
}
- return ret;
+ StopFadeInAnimation();
}
} // namespace Internal