Merge remote-tracking branch 'origin/tizen' into new_text
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / buttons / push-button-impl.cpp
index 8b96ba5..3910e43 100644 (file)
@@ -1,32 +1,29 @@
-//
-// 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/public-api/controls/text-controls/text-label.h>
 
 namespace Dali
 {
@@ -34,22 +31,15 @@ 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 ANIMATION_TIME( 0.2f );
+
 BaseHandle Create()
 {
   return Toolkit::PushButton::New();
@@ -57,58 +47,23 @@ BaseHandle Create()
 
 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.
+ * Get size of Actor if larger than given size
+ * @param[in] root the actor to get the size of
+ * @param[out] size the greater of the given size or the size of the Actor
  */
-void GetImageActorFilename( Actor& actor, std::string& path )
+void SizeOfActorIfLarger( Actor root, Vector3& size )
 {
-  path = ""; // Just return an empty string if not using ImageActor with an image
-
-  if ( actor )
+  if ( root )
   {
-    ImageActor imageActor = ImageActor::DownCast( actor );
-    if ( imageActor )
-    {
-      Image image = imageActor.GetImage();
-      if ( image )
-      {
-        path = image.GetFilename();
-      }
-    }
+    // RelayoutSize retreived for Actor to use any padding set to it.
+    size.width = std::max( root.GetRelayoutSize( WIDTH ), size.width );
+    size.height = std::max( root.GetRelayoutSize( HEIGHT ), size.height );
   }
 }
 
@@ -129,621 +84,571 @@ 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 )
+PushButton::PushButton()
+: Button(),
+  mSize()
 {
-  DALI_ASSERT_ALWAYS( initialAutoRepeatingDelay > 0.f );
-  mInitialAutoRepeatingDelay = initialAutoRepeatingDelay;
+  SetAnimationTime( ANIMATION_TIME );
 }
 
-float PushButton::GetInitialAutoRepeatingDelay() const
+PushButton::~PushButton()
 {
-  return mInitialAutoRepeatingDelay;
 }
 
-void PushButton::SetNextAutoRepeatingDelay( float nextAutoRepeatingDelay )
+void PushButton::OnButtonInitialize()
 {
-  DALI_ASSERT_ALWAYS( nextAutoRepeatingDelay > 0.f );
-  mNextAutoRepeatingDelay = nextAutoRepeatingDelay;
-}
+  // Push button requires the Leave event.
+  Actor self = Self();
+  self.SetLeaveRequired( true );
 
-float PushButton::GetNextAutoRepeatingDelay() const
-{
-  return mNextAutoRepeatingDelay;
+  // Set resize policy to natural size so that buttons will resize to background images
+  self.SetResizePolicy( USE_NATURAL_SIZE, ALL_DIMENSIONS );
 }
 
-void PushButton::SetToggleButton( bool toggle )
+void PushButton::OnLabelSet()
 {
-  mToggleButton = toggle;
+  Actor& label = GetLabel();
 
-  // A toggle button can't be an autorepeating button.
-  if( toggle )
+  if( label )
   {
-    mAutoRepeating = false;
-
-    // Notifies the painter.
-    GetPushButtonPainter( mPainter )->SetAutoRepeating( mAutoRepeating );
+    label.SetAnchorPoint( AnchorPoint::CENTER );
+    label.SetParentOrigin( ParentOrigin::CENTER );
+    label.SetSize( mSize );
   }
 }
 
-bool PushButton::IsToggleButton() const
-{
-  return mToggleButton;
-}
-
-void PushButton::SetToggled( bool toggle )
+void PushButton::OnButtonImageSet()
 {
-  if( !mDimmed && mToggleButton && ( toggle != mToggled ) )
-  {
-    mToggled = toggle;
+  Actor& buttonImage = GetButtonImage();
 
-    Toolkit::PushButton handle( GetOwner() );
+  buttonImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
 
-    // Notifies the painter the button has been toggled.
-    GetPushButtonPainter( mPainter )->Toggled( handle );
+  buttonImage.RelayoutRequestTree();
 
-    // Emit signal.
-    mToggledSignalV2.Emit( handle, mToggled );
-  }
+  RelayoutRequest();
 }
 
-bool PushButton::IsToggled() const
+void PushButton::OnSelectedImageSet()
 {
-  return mToggleButton && mToggled;
-}
+  Actor& selectedImage = GetSelectedImage();
 
-void PushButton::SetButtonImage( Image image )
-{
-  SetButtonImage( ImageActor::New( image ) );
-}
+  selectedImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
 
-void PushButton::SetButtonImage( Actor image )
-{
-  Toolkit::PushButton handle( GetOwner() );
-  GetPushButtonPainter( mPainter )->SetButtonImage( handle, image );
-}
+  selectedImage.RelayoutRequestTree();
 
-Actor& PushButton::GetButtonImage()
-{
-  return mButtonImage;
+  RelayoutRequest();
 }
 
-Actor PushButton::GetButtonImage() const
+void PushButton::OnBackgroundImageSet()
 {
-  return mButtonImage;
-}
+  Actor& backgroundImage = GetBackgroundImage();
 
-void PushButton::SetBackgroundImage( Image image )
-{
-  SetBackgroundImage( ImageActor::New( image ) );
-}
+  backgroundImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
 
-void PushButton::SetBackgroundImage( Actor image )
-{
-  Toolkit::PushButton handle( GetOwner() );
-  GetPushButtonPainter( mPainter )->SetBackgroundImage( handle, image );
-}
+  backgroundImage.RelayoutRequestTree();
 
-Actor& PushButton::GetBackgroundImage()
-{
-  return mBackgroundImage;
+  RelayoutRequest();
 }
 
-Actor PushButton::GetBackgroundImage() const
+void PushButton::OnSelectedBackgroundImageSet()
 {
-  return mBackgroundImage;
-}
+  Actor& selectedBackgroundImage = GetSelectedBackgroundImage();
 
-void PushButton::SetPressedImage( Image image )
-{
-  SetPressedImage( ImageActor::New( image ) );
+  selectedBackgroundImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
 }
 
-void PushButton::SetPressedImage( Actor image )
+void PushButton::OnDisabledImageSet()
 {
-  Toolkit::PushButton handle( GetOwner() );
-  GetPushButtonPainter( mPainter )->SetPressedImage( handle, image );
-}
+  Actor& disabledImage = GetDisabledImage();
 
-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;
-}
+  disabledImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
 
-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 );
-}
+  disabledImage.RelayoutRequestTree();
 
-Actor& PushButton::GetLabel()
-{
-  return mLabel;
+  RelayoutRequest();
 }
 
-Actor PushButton::GetLabelText() const
+void PushButton::OnDisabledBackgroundImageSet()
 {
-  return mLabel;
-}
+  Actor& disabledBackgroundImage = GetDisabledBackgroundImage();
 
-Actor& PushButton::GetFadeOutBackgroundImage()
-{
-  return mFadeOutBackgroundImage;
-}
+  disabledBackgroundImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
 
-Actor& PushButton::GetFadeOutButtonImage()
-{
-  return mFadeOutButtonImage;
-}
+  disabledBackgroundImage.RelayoutRequestTree();
 
-Toolkit::PushButton::ToggledSignalV2& PushButton::ToggledSignal()
-{
-  return mToggledSignalV2;
+  RelayoutRequest();
 }
 
-Toolkit::PushButton::PressedSignalV2& PushButton::PressedSignal()
+bool PushButton::OnSelected()
 {
-  return mPressedSignalV2;
-}
+  Actor& buttonImage = GetButtonImage();
+  Actor& selectedImage = GetSelectedImage();
+  Actor& selectedBackgroundImage = GetSelectedBackgroundImage();
 
-Toolkit::PushButton::ReleasedSignalV2& PushButton::ReleasedSignal()
-{
-  return mReleasedSignalV2;
-}
+  PaintState paintState = GetPaintState();
 
-bool PushButton::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
-{
-  Dali::BaseHandle handle( object );
+  switch( paintState )
+  {
+    case UnselectedState:
+    {
+      FadeOutImage( buttonImage );
+      FadeInImage( selectedBackgroundImage );
+      FadeInImage( selectedImage );
+      StartTransitionAnimation();
+      break;
+    }
+    case SelectedState:
+    {
+      FadeOutImage( selectedBackgroundImage );
+      FadeOutImage( selectedImage );
+      FadeInImage( buttonImage );
+      StartTransitionAnimation();
+      break;
+    }
+    case UnselectedSelectedTransition:
+    {
+      float opacity = 1.f;
+      if( selectedImage )
+      {
+        opacity = selectedImage.GetCurrentOpacity();
+      }
 
-  bool connected( true );
-  Toolkit::PushButton button = Toolkit::PushButton::DownCast(handle);
+      StopTransitionAnimation( false );
+      FadeOutImage( selectedBackgroundImage, opacity );
+      FadeOutImage( selectedImage, opacity );
+      FadeInImage( buttonImage, 1.f - opacity );
+      StartTransitionAnimation();
+      break;
+    }
+    case SelectedUnselectedTransition:
+    {
+      float opacity = 0.f;
+      if( selectedImage )
+      {
+        opacity = selectedImage.GetCurrentOpacity();
+      }
 
-  if( Toolkit::PushButton::SIGNAL_TOGGLED == signalName )
-  {
-    button.ToggledSignal().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 );
+      StopTransitionAnimation( false );
+      FadeOutImage( buttonImage, 1.f - opacity );
+      FadeInImage( selectedBackgroundImage, opacity );
+      FadeInImage( selectedImage, opacity );
+      StartTransitionAnimation();
+      break;
+    }
+    case DisabledUnselectedTransition:
+    {
+      StopTransitionAnimation();
+      FadeOutImage( buttonImage );
+      FadeInImage( selectedBackgroundImage );
+      FadeInImage( selectedImage );
+      StartTransitionAnimation();
+      break;
+    }
+    case DisabledSelectedTransition:
+    {
+      StopTransitionAnimation();
+      FadeOutImage( selectedBackgroundImage );
+      FadeOutImage( selectedImage );
+      FadeInImage( buttonImage );
+      StartTransitionAnimation();
+      break;
+    }
+    default:
+    {
+      break;
+    }
   }
-  else
+
+  if( mTransitionAnimation )
   {
-    // signalName does not match any signal
-    connected = false;
+    return true;
   }
 
-  return connected;
+  return false;
 }
 
-void PushButton::SetProperty( BaseObject* object, Property::Index propertyIndex, const Property::Value& value )
+bool PushButton::OnDisabled()
 {
-  Toolkit::PushButton pushButton = Toolkit::PushButton::DownCast( Dali::BaseHandle( object ) );
+  Actor& buttonImage = GetButtonImage();
+  Actor& selectedImage = GetSelectedImage();
+  Actor& selectedBackgroundImage = GetSelectedBackgroundImage();
+  Actor& backgroundImage = GetBackgroundImage();
+  Actor& disabledImage = GetDisabledImage();
+  Actor& disabledSelectedImage = GetDisabledSelectedImage();
+  Actor& disabledBackgroundImage = GetDisabledBackgroundImage();
 
-  if ( pushButton )
-  {
-    PushButton& pushButtonImpl( GetImplementation( pushButton ) );
+  PaintState paintState = GetPaintState();
 
-    switch ( propertyIndex )
+  switch( paintState )
+  {
+    case UnselectedState:
     {
-      case Toolkit::PushButton::PROPERTY_AUTO_REPEATING:
-      {
-        pushButtonImpl.SetAutoRepeating( value.Get< bool >() );
-        break;
-      }
-
-      case Toolkit::PushButton::PROPERTY_INITIAL_AUTO_REPEATING_DELAY:
-      {
-        pushButtonImpl.SetInitialAutoRepeatingDelay( value.Get< float >() );
-        break;
-      }
-
-      case Toolkit::PushButton::PROPERTY_NEXT_AUTO_REPEATING_DELAY:
+      FadeOutImage( backgroundImage );
+      FadeOutImage( buttonImage );
+      FadeInImage( disabledBackgroundImage );
+      FadeInImage( disabledImage );
+      StartTransitionAnimation();
+      break;
+    }
+    case SelectedState:
+    {
+      FadeOutImage( backgroundImage );
+      FadeOutImage( selectedBackgroundImage );
+      FadeOutImage( selectedImage );
+      FadeInImage( disabledBackgroundImage );
+      FadeInImage( disabledSelectedImage );
+      StartTransitionAnimation();
+      break;
+    }
+    case DisabledUnselectedState:
+    {
+      FadeOutImage( disabledBackgroundImage );
+      FadeOutImage( disabledImage );
+      FadeInImage( backgroundImage );
+      FadeInImage( buttonImage );
+      StartTransitionAnimation();
+      break;
+    }
+    case DisabledSelectedState:
+    {
+      FadeOutImage( disabledBackgroundImage );
+      FadeOutImage( disabledSelectedImage );
+      FadeInImage( backgroundImage );
+      FadeInImage( selectedBackgroundImage );
+      FadeInImage( selectedImage );
+      StartTransitionAnimation();
+      break;
+    }
+    case UnselectedSelectedTransition:
+    {
+      float opacity = 1.f;
+      if( selectedImage )
       {
-        pushButtonImpl.SetNextAutoRepeatingDelay( value.Get< float >() );
-        break;
+        opacity = selectedImage.GetCurrentOpacity();
       }
 
-      case Toolkit::PushButton::PROPERTY_TOGGLABLE:
+      StopTransitionAnimation();
+      FadeOutImage( backgroundImage );
+      FadeOutImage( selectedBackgroundImage, opacity );
+      FadeOutImage( selectedImage, opacity );
+      FadeInImage( disabledBackgroundImage );
+      FadeInImage( disabledSelectedImage );
+      StartTransitionAnimation();
+      break;
+    }
+    case SelectedUnselectedTransition:
+    {
+      float opacity = 1.f;
+      if( buttonImage )
       {
-        pushButtonImpl.SetToggleButton( value.Get< bool >() );
-        break;
+        opacity = buttonImage.GetCurrentOpacity();
       }
 
-      case Toolkit::PushButton::PROPERTY_TOGGLE:
+      StopTransitionAnimation();
+      FadeOutImage( backgroundImage );
+      FadeOutImage( buttonImage, opacity );
+      FadeInImage( disabledBackgroundImage );
+      FadeInImage( disabledImage );
+      StartTransitionAnimation();
+      break;
+    }
+    case UnselectedDisabledTransition:
+    {
+      float opacity = 1.f;
+      if( disabledImage )
       {
-        pushButtonImpl.SetToggled( value.Get< bool >() );
-        break;
+        opacity = disabledImage.GetCurrentOpacity();
       }
 
-      case Toolkit::PushButton::PROPERTY_BUTTON_IMAGE:
+      StopTransitionAnimation( false );
+      FadeOutImage( disabledBackgroundImage, opacity );
+      FadeOutImage( disabledImage, opacity );
+      FadeInImage( backgroundImage, 1.f - opacity );
+      FadeInImage( buttonImage, 1.f - opacity );
+      StartTransitionAnimation();
+      break;
+    }
+    case DisabledUnselectedTransition:
+    {
+      float opacity = 1.f;
+      if( buttonImage )
       {
-        Image image = Image::New( value.Get<std::string>() );
-        pushButtonImpl.SetButtonImage( image );
-        break;
+        opacity = buttonImage.GetCurrentOpacity();
       }
 
-      case Toolkit::PushButton::PROPERTY_PRESSED_IMAGE:
+      StopTransitionAnimation( false );
+      FadeOutImage( backgroundImage, opacity );
+      FadeOutImage( buttonImage, opacity );
+      FadeInImage( disabledBackgroundImage, 1.f - opacity );
+      FadeInImage( disabledImage, 1.f - opacity );
+      StartTransitionAnimation();
+      break;
+    }
+    case SelectedDisabledTransition:
+    {
+      float opacity = 1.f;
+      if( disabledSelectedImage )
       {
-        Image image = Image::New( value.Get<std::string>() );
-        pushButtonImpl.SetPressedImage( image );
-        break;
+        opacity = disabledSelectedImage.GetCurrentOpacity();
       }
 
-      case Toolkit::PushButton::PROPERTY_DIMMED_IMAGE:
+      StopTransitionAnimation( false );
+      FadeOutImage( disabledBackgroundImage, opacity );
+      FadeOutImage( disabledSelectedImage, opacity );
+      FadeInImage( backgroundImage, 1.f - opacity );
+      FadeInImage( selectedBackgroundImage, 1.f - opacity );
+      FadeInImage( selectedImage, 1.f - opacity );
+      StartTransitionAnimation();
+      break;
+    }
+    case DisabledSelectedTransition:
+    {
+      float opacity = 1.f;
+      if( selectedImage )
       {
-        Image image = Image::New( value.Get<std::string>() );
-        pushButtonImpl.SetDimmedImage( image );
-        break;
+        opacity = selectedImage.GetCurrentOpacity();
       }
 
-      case Toolkit::PushButton::PROPERTY_LABEL_TEXT:
-      {
-        pushButtonImpl.SetLabelText( value.Get< std::string >() );
-        break;
-      }
+      StopTransitionAnimation( false );
+      FadeOutImage( backgroundImage, opacity );
+      FadeOutImage( selectedBackgroundImage, opacity );
+      FadeOutImage( selectedImage, opacity );
+      FadeInImage( disabledBackgroundImage, 1.f - opacity );
+      FadeInImage( disabledSelectedImage, 1.f - opacity );
+      StartTransitionAnimation();
+      break;
     }
   }
+
+  if( mTransitionAnimation )
+  {
+    return true;
+  }
+
+  return false;
 }
 
-Property::Value PushButton::GetProperty( BaseObject* object, Property::Index propertyIndex )
+bool PushButton::OnPressed()
 {
-  Property::Value value;
+  Actor& buttonImage = GetButtonImage();
+  Actor& selectedImage = GetSelectedImage();
+  Actor& selectedBackgroundImage = GetSelectedBackgroundImage();
 
-  Toolkit::PushButton pushButton = Toolkit::PushButton::DownCast( Dali::BaseHandle( object ) );
+  PaintState paintState = GetPaintState();
 
-  if ( pushButton )
+  switch( paintState )
   {
-    PushButton& pushButtonImpl( GetImplementation( pushButton ) );
-
-    switch ( propertyIndex )
+    case UnselectedState:
     {
-      case Toolkit::PushButton::PROPERTY_AUTO_REPEATING:
-      {
-        value = pushButtonImpl.mAutoRepeating;
-        break;
-      }
-
-      case Toolkit::PushButton::PROPERTY_INITIAL_AUTO_REPEATING_DELAY:
-      {
-        value = pushButtonImpl.mInitialAutoRepeatingDelay;
-        break;
-      }
-
-      case Toolkit::PushButton::PROPERTY_NEXT_AUTO_REPEATING_DELAY:
-      {
-        value = pushButtonImpl.mNextAutoRepeatingDelay;
-        break;
-      }
-
-      case Toolkit::PushButton::PROPERTY_TOGGLABLE:
-      {
-        value = pushButtonImpl.mToggleButton;
-        break;
-      }
-
-      case Toolkit::PushButton::PROPERTY_TOGGLE:
-      {
-        value = pushButtonImpl.mToggled;
-        break;
-      }
-
-      case Toolkit::PushButton::PROPERTY_BUTTON_IMAGE:
-      {
-        std::string path;
-        GetImageActorFilename( pushButtonImpl.mButtonImage, path );
-        value = path;
-        break;
-      }
-
-      case Toolkit::PushButton::PROPERTY_PRESSED_IMAGE:
+      FadeOutImage( buttonImage );
+      FadeInImage( selectedBackgroundImage );
+      FadeInImage( selectedImage );
+      StartTransitionAnimation();
+      break;
+    }
+    case SelectedUnselectedTransition:
+    {
+      float opacity = 1.f;
+      if( buttonImage )
       {
-        std::string path;
-        GetImageActorFilename( pushButtonImpl.mPressedImage, path );
-        value = path;
-        break;
+        opacity = buttonImage.GetCurrentOpacity();
       }
 
-      case Toolkit::PushButton::PROPERTY_DIMMED_IMAGE:
+      StopTransitionAnimation( false );
+      FadeOutImage( buttonImage, opacity );
+      FadeInImage( selectedBackgroundImage, 1.f - opacity );
+      FadeInImage( selectedImage, 1.f - opacity );
+      StartTransitionAnimation();
+      break;
+    }
+    case DisabledUnselectedTransition:
+    {
+      float opacity = 1.f;
+      if( buttonImage )
       {
-        std::string path;
-        GetImageActorFilename( pushButtonImpl.mDimmedImage, path );
-        value = path;
-        break;
+        opacity = buttonImage.GetCurrentOpacity();
       }
 
-      case Toolkit::PushButton::PROPERTY_LABEL_TEXT:
-      {
-        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;
-      }
+      StopTransitionAnimation();
+      FadeOutImage( buttonImage, opacity );
+      FadeInImage( selectedBackgroundImage );
+      FadeInImage( selectedImage );
+      StartTransitionAnimation();
+      break;
     }
+    default:
+      break;
   }
 
-  return value;
-}
+  if( mTransitionAnimation )
+  {
+    return true;
+  }
 
-void PushButton::OnButtonInitialize()
-{
-  // Push button requires the Leave event.
-  Actor root = Self();
-  root.SetLeaveRequired( true );
+  return false;
 }
 
-void PushButton::OnButtonDown()
+bool PushButton::OnReleased()
 {
-  if( !mToggleButton )
-  {
-    Toolkit::PushButton handle( GetOwner() );
-
-    // Notifies the painter the button has been pressed.
-    GetPushButtonPainter( mPainter )->Pressed( handle );
-
-    if( mAutoRepeating )
-    {
-      SetUpTimer( mInitialAutoRepeatingDelay );
-    }
+  Actor& buttonImage = GetButtonImage();
+  Actor& selectedImage = GetSelectedImage();
+  Actor& selectedBackgroundImage = GetSelectedBackgroundImage();
 
-    //Emit signal.
-    mPressedSignalV2.Emit( handle );
-  }
-}
+  PaintState paintState = GetPaintState();
 
-void PushButton::OnButtonUp()
-{
-  if( ButtonDown == mState )
+  switch( paintState )
   {
-    if( mToggleButton )
+    case SelectedState:
     {
-      mToggled = !mToggled;
-
-      Toolkit::PushButton handle( GetOwner() );
-
-      // Notifies the painter the button has been toggled.
-      GetPushButtonPainter( mPainter )->Toggled( handle );
-
-      //Emit signal.
-      mToggledSignalV2.Emit( handle, mToggled );
+      FadeOutImage( selectedBackgroundImage );
+      FadeOutImage( selectedImage );
+      FadeInImage( buttonImage );
+      StartTransitionAnimation();
+      break;
     }
-    else
+    case UnselectedSelectedTransition:
     {
-      Toolkit::PushButton handle( GetOwner() );
-
-      // Notifies the painter the button has been clicked.
-      GetPushButtonPainter( mPainter )->Released( handle );
-      GetPushButtonPainter( mPainter )->Clicked( handle );
-
-      if( mAutoRepeating )
+      float opacity = 1.f;
+      if( selectedImage )
       {
-        mAutoRepeatingTimer.Reset();
+        opacity = selectedImage.GetCurrentOpacity();
       }
 
-      //Emit signal.
-      mReleasedSignalV2.Emit( handle );
-      mClickedSignalV2.Emit( handle );
+      StopTransitionAnimation( false );
+      FadeOutImage( selectedBackgroundImage, opacity );
+      FadeOutImage( selectedImage, opacity );
+      FadeInImage( buttonImage, 1.f - opacity );
+      StartTransitionAnimation();
+      break;
     }
-  }
-}
-
-void PushButton::OnTouchPointLeave()
-{
-  if( ButtonDown == mState )
-  {
-    if( !mToggleButton )
+    case DisabledSelectedTransition:
     {
-      Toolkit::PushButton handle( GetOwner() );
-
-      // Notifies the painter the button has been released.
-      GetPushButtonPainter( mPainter )->Released( handle );
-
-      if( mAutoRepeating )
+      float opacity = 1.f;
+      if( selectedImage )
       {
-        mAutoRepeatingTimer.Reset();
+        opacity = selectedImage.GetCurrentOpacity();
       }
 
-      //Emit signal.
-      mReleasedSignalV2.Emit( handle );
+      StopTransitionAnimation();
+      FadeOutImage( selectedBackgroundImage, opacity );
+      FadeOutImage( selectedImage, opacity );
+      FadeInImage( buttonImage );
+      StartTransitionAnimation();
+      break;
+    }
+    default:
+    {
+      break;
     }
   }
-}
-
-void PushButton::OnTouchPointInterrupted()
-{
-  OnTouchPointLeave();
-}
 
-void PushButton::OnAnimationTimeSet( float animationTime )
-{
-  GetPushButtonPainter( mPainter )->SetAnimationTime( animationTime );
-}
+  if( mTransitionAnimation )
+  {
+    return true;
+  }
 
-float PushButton::OnAnimationTimeRequested() const
-{
-  return GetPushButtonPainter( mPainter )->GetAnimationTime();
+  return false;
 }
 
-PushButton::PushButton()
-: Button(),
-  mAutoRepeating( false ),
-  mInitialAutoRepeatingDelay( INITIAL_AUTOREPEATING_DELAY ),
-  mNextAutoRepeatingDelay( NEXT_AUTOREPEATING_DELAY ),
-  mToggleButton( false ),
-  mAutoRepeatingTimer(),
-  mToggled( false ),
-  mClickActionPerforming(false)
+void PushButton::StopAllAnimations()
 {
-  // Creates specific painter.
-  mPainter = PushButtonDefaultPainterPtr( new PushButtonDefaultPainter() );
+  StopTransitionAnimation();
 }
 
-PushButton::~PushButton()
+void PushButton::OnControlSizeSet( const Vector3& targetSize )
 {
-  if( mAutoRepeatingTimer )
+  if( targetSize != mSize )
   {
-    mAutoRepeatingTimer.Reset();
-  }
+    mSize = targetSize;
 
-  mPainter = NULL;
-}
+    Actor& label = GetLabel();
 
-void PushButton::SetUpTimer( float delay )
-{
-  mAutoRepeatingTimer = Dali::Timer::New( static_cast<unsigned int>( 1000.f * delay ) );
-  mAutoRepeatingTimer.TickSignal().Connect( this, &PushButton::AutoRepeatingSlot );
-  mAutoRepeatingTimer.Start();
+    if( label )
+    {
+      label.SetSize( mSize );
+    }
+  }
 }
 
-bool PushButton::AutoRepeatingSlot()
+Vector3 PushButton::GetNaturalSize()
 {
-  bool consumed = false;
-  if( !mDimmed )
-  {
-    // Restart the autorepeat timer.
-    SetUpTimer( mNextAutoRepeatingDelay );
+  Vector3 size;
 
-    Toolkit::PushButton handle( GetOwner() );
+  // Check Image and Background image and use the largest size as the control's Natural size.
+  SizeOfActorIfLarger( GetButtonImage(), size );
+  SizeOfActorIfLarger( GetBackgroundImage(), size );
 
-    // Notifies the painter the button has been pressed.
-    GetPushButtonPainter( mPainter )->Pressed( handle );
+  // If label, test against it's size
+  Toolkit::TextLabel label = Toolkit::TextLabel::DownCast( GetLabel() );
+  if( label )
+  {
+    Vector3 labelSize = label.GetNaturalSize();
 
-    //Emit signal.
-    consumed = mReleasedSignalV2.Emit( handle );
-    consumed |= mClickedSignalV2.Emit( handle );
-    consumed |= mPressedSignalV2.Emit( handle );
- }
+    size.width  = std::max( size.width,  labelSize.width  + TEXT_PADDING * 2.0f );
+    size.height = std::max( size.height, labelSize.height + TEXT_PADDING * 2.0f );
+  }
 
-  return consumed;
+  return size;
 }
 
-void PushButton::OnActivated()
+void PushButton::StartTransitionAnimation()
 {
-  // When the button is activated, it performs the click action
-  std::vector<Property::Value> attributes;
-  DoClickAction(attributes);
+  if( mTransitionAnimation )
+  {
+    mTransitionAnimation.FinishedSignal().Connect( this, &PushButton::TransitionAnimationFinished );
+    mTransitionAnimation.Play();
+  }
 }
 
-void PushButton::DoClickAction(const PropertyValueContainer& attributes)
+void PushButton::StopTransitionAnimation( bool remove )
 {
-  // Prevents the button signals from doing a recursive loop by sending an action
-  // and re-emitting the signals.
-  if(!mClickActionPerforming)
+  if( mTransitionAnimation )
   {
-    mClickActionPerforming = true;
-    OnButtonDown();
-    mState = ButtonDown;
-    OnButtonUp();
-    mClickActionPerforming = false;
+    mTransitionAnimation.Clear();
+    mTransitionAnimation.Reset();
+  }
+
+  if( remove )
+  {
+    UpdatePaintTransitionState();
   }
 }
 
-bool PushButton::DoAction(BaseObject* object, const std::string& actionName, const std::vector<Property::Value>& attributes)
+void PushButton::FadeInImage( Actor& image, float opacity, Vector3 scale )
 {
-  bool ret = false;
-
-  Dali::BaseHandle handle(object);
+  if( image )
+  {
+    image.SetOpacity( opacity );
+    image.SetScale( scale );
 
-  Toolkit::PushButton button = Toolkit::PushButton::DownCast(handle);
+    if( !mTransitionAnimation )
+    {
+      mTransitionAnimation = Dali::Animation::New( GetAnimationTime() );
+    }
 
-  DALI_ASSERT_ALWAYS(button);
+    mTransitionAnimation.AnimateTo( Property( image, Actor::Property::COLOR_ALPHA ), 1.f );
+  }
+}
 
-  if(Toolkit::PushButton::ACTION_PUSH_BUTTON_CLICK == actionName)
+void PushButton::FadeOutImage( Actor& image, float opacity, Vector3 scale )
+{
+  if( image )
   {
-    GetImplementation(button).DoClickAction(attributes);
-    ret = true;
+    image.SetOpacity( opacity );
+    image.SetScale( scale );
+
+    if( !mTransitionAnimation )
+    {
+      mTransitionAnimation = Dali::Animation::New( GetAnimationTime() );
+    }
+
+    mTransitionAnimation.AnimateTo( Property( image, Actor::Property::COLOR_ALPHA ), 0.f );
   }
+}
 
-  return ret;
+void PushButton::TransitionAnimationFinished( Dali::Animation& source )
+{
+  StopTransitionAnimation();
 }
 
 } // namespace Internal