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 c5e078f..08948de 100644 (file)
@@ -1,33 +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>
-
 namespace Dali
 {
 
@@ -40,7 +36,13 @@ namespace Internal
 namespace
 {
 
-using namespace Dali;
+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()
 {
@@ -49,26 +51,33 @@ 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 );
-
-}
-
+} // 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 )
+/**
+ * Find the first image actor in the actor hierarchy
+ */
+ImageActor FindImageActor( Actor root )
+{
+  ImageActor imageActor = ImageActor::DownCast( root );
+  if( !imageActor && root )
   {
-    return static_cast<PushButtonDefaultPainter*>( painter.Get() );
+    for( unsigned int i = 0, numChildren = root.GetChildCount(); i < numChildren; ++i )
+    {
+      ImageActor childImageActor = FindImageActor( root.GetChildAt( i ) );
+      if( childImageActor )
+      {
+        return childImageActor;
+      }
+    }
   }
-} // namespace
+
+  return imageActor;
+}
+
+} // unnamed namespace
 
 Dali::Toolkit::PushButton PushButton::New()
 {
@@ -85,465 +94,1194 @@ Dali::Toolkit::PushButton PushButton::New()
   return pushButton;
 }
 
-void PushButton::SetAutoRepeating( bool autoRepeating )
+PushButton::PushButton()
+: Button(),
+  mSize(),
+  mPaintState( UnselectedState )
+{
+  SetAnimationTime( ANIMATION_TIME );
+}
+
+PushButton::~PushButton()
 {
-  mAutoRepeating = autoRepeating;
+}
 
-  // An autorepeating button can't be a toggle button.
-  if( autoRepeating )
+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, 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  );
 
-    // Notifies the painter.
-    GetPushButtonPainter( mPainter )->SetAutoRepeating( mAutoRepeating );
+        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();
+
+      // 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( !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, 0.0f, 0 );
 
-    // Emit signal.
-    mToggledSignalV2.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::SetPressedImage( Image image )
-{
-  SetPressedImage( ImageActor::New( image ) );
-}
+        FadeInImage( disabledImage, 0.0f, 0 );
 
-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, 0.0f, 0 );
+      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.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
 }
 
-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, 0.0f, 0 );
 
-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, 0.0f, 0 );
+      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.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
 }
 
-Toolkit::PushButton::ToggledSignalV2& PushButton::ToggledSignal()
+void PushButton::OnButtonInitialize()
 {
-  return mToggledSignalV2;
+  // 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 );
 }
 
-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, 0.0f, 0 );
+      StartFadeOutAnimation();
+      StartFadeInAnimation();
+
+      if( buttonImage || selectedImage )
+      {
+        mPaintState = UnselectedSelectedTransition;
+      }
+      else
+      {
+        mPaintState = SelectedState;
+      }
+      break;
+    }
+    case SelectedState:
+    {
+      StopFadeOutAnimation();
+      FadeOutImage( Foreground, selectedImage );
+      FadeInImage( buttonImage, 0.0f, 0 );
+      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, 0 );
+
+      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, 0 );
+
+      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 );
+  Actor& buttonImage = GetButtonImage();
+  Actor& selectedImage = GetSelectedImage();
+  Actor& backgroundImage = GetBackgroundImage();
+  Actor& disabledImage = GetDisabledImage();
+  Actor& disabledBackgroundImage = GetDisabledBackgroundImage();
+  Actor& fadeOutButtonImage = GetFadeOutButtonImage();
+
+  switch( mPaintState )
+  {
+  case UnselectedState:
+  {
+    if( disabled )
+    {
+      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;
+      }
+    }
+    break;
+  }
+  case SelectedState:
+  {
+    if( disabled )
+    {
+      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;
+      }
+    }
+    break;
+  }
+  case DisabledUnselectedState:
+  {
+    if( !disabled )
+    {
+      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;
+      }
+    }
+    break;
+  }
+  case DisabledSelectedState:
+  {
+    if( !disabled )
+    {
+      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;
+      }
+    }
+    break;
+  }
+  case UnselectedSelectedTransition:
+  {
+    if( disabled )
+    {
+      float opacity = 1.f;
+      if( fadeOutButtonImage )
+      {
+        opacity = fadeOutButtonImage.GetCurrentOpacity();
+      }
+      StopFadeOutAnimation();
+      StopFadeInAnimation();
+
+      FadeOutImage( Foreground, selectedImage, 1.f - opacity );
+      FadeOutImage( Background, backgroundImage );
 
-  bool connected( true );
-  Toolkit::PushButton button = Toolkit::PushButton::DownCast(handle);
+      FadeInImage( disabledImage, 0.0f, 0 );
+      FadeInImage( disabledBackgroundImage, 0.0f, 0 );
 
-  if( Toolkit::PushButton::SIGNAL_TOGGLED == signalName )
+      StartFadeOutAnimation();
+      StartFadeInAnimation();
+
+      if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
+      {
+        mPaintState = SelectedDisabledTransition;
+      }
+      else
+      {
+        mPaintState = DisabledSelectedState;
+      }
+    }
+    break;
+  }
+  case SelectedUnselectedTransition:
   {
-    button.ToggledSignal().Connect( tracker, functor );
+    if( disabled )
+    {
+      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;
   }
-  else if( Toolkit::PushButton::SIGNAL_PRESSED == signalName )
+  case UnselectedDisabledTransition:
   {
-    button.PressedSignal().Connect( tracker, functor );
+    if( !disabled )
+    {
+      float opacity = 1.f;
+      if( fadeOutButtonImage )
+      {
+        opacity = fadeOutButtonImage.GetCurrentOpacity();
+      }
+      StopFadeOutAnimation( false );
+      StopFadeInAnimation();
+
+      FadeOutImage( Foreground, disabledImage, 1.f - opacity );
+      FadeOutImage( Background, disabledBackgroundImage, 1.f - opacity );
+      FadeInImage( buttonImage, opacity, 0 );
+      FadeInImage( backgroundImage, opacity, 0 );
+
+      StartFadeOutAnimation();
+      StartFadeInAnimation();
+
+      if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
+      {
+        mPaintState = DisabledUnselectedTransition;
+      }
+      else
+      {
+        mPaintState = UnselectedState;
+      }
+    }
+    break;
   }
-  else if( Toolkit::PushButton::SIGNAL_RELEASED == signalName )
+  case DisabledUnselectedTransition:
   {
-    button.ReleasedSignal().Connect( tracker, functor );
+    if( disabled )
+    {
+      float opacity = 1.f;
+      if( fadeOutButtonImage )
+      {
+        opacity = fadeOutButtonImage.GetCurrentOpacity();
+      }
+      StopFadeOutAnimation( false );
+      StopFadeInAnimation();
+
+      FadeOutImage( Foreground, buttonImage, 1.f - opacity );
+      FadeOutImage( Background, backgroundImage, 1.f - opacity );
+      FadeInImage( disabledImage, opacity, 0 );
+      FadeInImage( disabledBackgroundImage, opacity, 0 );
+
+      StartFadeOutAnimation();
+      StartFadeInAnimation();
+
+      if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
+      {
+        mPaintState = UnselectedDisabledTransition;
+      }
+      else
+      {
+        mPaintState = DisabledUnselectedState;
+      }
+    }
+    break;
   }
-  else
+  case SelectedDisabledTransition:
   {
-    // signalName does not match any signal
-    connected = false;
+    if( !disabled )
+    {
+      float opacity = 1.f;
+      if( fadeOutButtonImage )
+      {
+        opacity = fadeOutButtonImage.GetCurrentOpacity();
+      }
+      StopFadeOutAnimation( false );
+      StopFadeInAnimation();
+
+      FadeOutImage( Foreground, disabledImage, 1.f - opacity );
+      FadeOutImage( Background, disabledBackgroundImage, 1.f - opacity );
+      FadeInImage( selectedImage, opacity, 0 );
+      FadeInImage( backgroundImage, opacity, 0 );
+
+      StartFadeOutAnimation();
+      StartFadeInAnimation();
+
+      if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
+      {
+        mPaintState = DisabledSelectedTransition;
+      }
+      else
+      {
+        mPaintState = SelectedState;
+      }
+    }
+    break;
   }
+  case DisabledSelectedTransition:
+  {
+    if( disabled )
+    {
+      float opacity = 1.f;
+      if( fadeOutButtonImage )
+      {
+        opacity = fadeOutButtonImage.GetCurrentOpacity();
+      }
+      StopFadeOutAnimation( false );
+      StopFadeInAnimation();
 
-  return connected;
-}
+      FadeOutImage( Foreground, selectedImage, 1.f - opacity );
+      FadeOutImage( Background, backgroundImage, 1.f - opacity );
+      FadeInImage( disabledImage, opacity, 0 );
+      FadeInImage( disabledBackgroundImage, opacity, 0 );
 
-void PushButton::OnButtonInitialize()
-{
-  // Push button requires the Leave event.
-  Actor root = Self();
-  root.SetLeaveRequired( true );
+      StartFadeOutAnimation();
+      StartFadeInAnimation();
+
+      if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
+      {
+        mPaintState = SelectedDisabledTransition;
+      }
+      else
+      {
+        mPaintState = DisabledSelectedState;
+      }
+    }
+    break;
+  }
+  default:
+    break;
+  }
 }
 
-void PushButton::OnButtonDown()
+void PushButton::OnPressed()
 {
-  if( !mToggleButton )
-  {
-    Toolkit::PushButton handle( GetOwner() );
+  Actor& selectedImage = GetSelectedImage();
+  Actor& buttonImage = GetButtonImage();
+  Actor& fadeOutButtonImage = GetFadeOutButtonImage();
 
-    // Notifies the painter the button has been pressed.
-    GetPushButtonPainter( mPainter )->Pressed( handle );
+  switch( mPaintState )
+  {
+    case UnselectedState:
+    {
+      StopFadeOutAnimation();
+      FadeOutImage( Foreground, buttonImage );
+      FadeInImage( selectedImage, 0.0f, 0 );
+      StartFadeOutAnimation();
+      StartFadeInAnimation();
 
-    if( mAutoRepeating )
+      if( buttonImage || selectedImage )
+      {
+        mPaintState = UnselectedSelectedTransition;
+      }
+      else
+      {
+        mPaintState = SelectedState;
+      }
+      break;
+    }
+    case UnselectedSelectedTransition:
     {
-      SetUpTimer( mInitialAutoRepeatingDelay );
+      if( !IsAutoRepeating() )
+      {
+        mPaintState = SelectedUnselectedTransition;
+      }
+      break;
     }
+    case SelectedUnselectedTransition:
+    {
+      float opacity = 1.f;
+      if( fadeOutButtonImage )
+      {
+        opacity = fadeOutButtonImage.GetCurrentOpacity();
+      }
+      StopFadeOutAnimation( false );
+      StopFadeInAnimation();
+
+      FadeOutImage( Foreground, buttonImage, 1.f - opacity );
+      FadeInImage( selectedImage, opacity, 0 );
 
-    //Emit signal.
-    mPressedSignalV2.Emit( handle );
+      StartFadeOutAnimation();
+      StartFadeInAnimation();
+
+      if( buttonImage || selectedImage )
+      {
+        mPaintState = UnselectedSelectedTransition;
+      }
+      else
+      {
+        mPaintState = SelectedState;
+      }
+      break;
+    }
+    default:
+      break;
   }
 }
 
-void PushButton::OnButtonUp()
+void PushButton::OnReleased()
 {
-  if( ButtonDown == mState )
+  Actor& selectedImage = GetSelectedImage();
+  Actor& buttonImage = GetButtonImage();
+  Actor& fadeOutButtonImage = GetFadeOutButtonImage();
+
+  switch( mPaintState )
   {
-    if( mToggleButton )
+    case SelectedState:
     {
-      mToggled = !mToggled;
-
-      Toolkit::PushButton handle( GetOwner() );
+      StopFadeOutAnimation();
+      FadeOutImage( Foreground, selectedImage );
+      FadeInImage( buttonImage, 0.0f, 0 );
+      StartFadeOutAnimation();
+      StartFadeInAnimation();
 
-      // Notifies the painter the button has been toggled.
-      GetPushButtonPainter( mPainter )->Toggled( handle );
-
-      //Emit signal.
-      mToggledSignalV2.Emit( handle, mToggled );
+      if( buttonImage || selectedImage )
+      {
+        mPaintState = SelectedUnselectedTransition;
+      }
+      else
+      {
+        mPaintState = UnselectedState;
+      }
+      break;
     }
-    else
+    case UnselectedSelectedTransition:
     {
-      Toolkit::PushButton handle( GetOwner() );
+      float opacity = 1.f;
+      if( fadeOutButtonImage )
+      {
+        opacity = fadeOutButtonImage.GetCurrentOpacity();
+      }
+      StopFadeOutAnimation( false );
+      StopFadeInAnimation();
 
-      // Notifies the painter the button has been clicked.
-      GetPushButtonPainter( mPainter )->Released( handle );
-      GetPushButtonPainter( mPainter )->Clicked( handle );
+      FadeOutImage( Foreground, selectedImage, 1.f - opacity );
+      FadeInImage( buttonImage, opacity, 0 );
 
-      if( mAutoRepeating )
+      StartFadeOutAnimation();
+      StartFadeInAnimation();
+
+      if( buttonImage || selectedImage )
+      {
+        mPaintState = SelectedUnselectedTransition;
+      }
+      else
       {
-        mAutoRepeatingTimer.Reset();
+        mPaintState = UnselectedState;
       }
+      break;
+    }
+    default:
+    {
+      break;
+    }
+  }
+}
+
+void PushButton::OnClicked()
+{
+  OnReleased();
+}
+
+void PushButton::OnControlSizeSet( const Vector3& targetSize )
+{
+  if( targetSize != mSize )
+  {
+    mSize = targetSize;
 
-      //Emit signal.
-      mReleasedSignalV2.Emit( handle );
-      mClickedSignalV2.Emit( handle );
+    Actor& label = GetLabel();
+
+    if( label )
+    {
+      label.SetSize( mSize );
     }
   }
 }
 
-void PushButton::OnTouchPointLeave()
+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 )
     {
-      Toolkit::PushButton handle( GetOwner() );
+      Vector3 imageSize = imageActor.GetNaturalSize();
 
-      // Notifies the painter the button has been released.
-      GetPushButtonPainter( mPainter )->Released( handle );
+      if( widthIsZero )
+      {
+        size.width = imageSize.width;
+      }
 
-      if( mAutoRepeating )
+      if( heightIsZero )
       {
-        mAutoRepeatingTimer.Reset();
+        size.height = imageSize.height;
       }
+    }
 
-      //Emit signal.
-      mReleasedSignalV2.Emit( handle );
+    ImageActor backgroundImageActor = FindImageActor( GetBackgroundImage() );
+    if( backgroundImageActor && backgroundImageActor.GetStyle() != ImageActor::STYLE_NINE_PATCH )
+    {
+      Vector3 imageSize = backgroundImageActor.GetNaturalSize();
+
+      if( widthIsZero )
+      {
+        size.width = std::max( size.width, imageSize.width );
+      }
+
+      if( heightIsZero )
+      {
+        size.height = std::max( size.height, imageSize.height );
+      }
     }
   }
+
+  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( mAutoRepeatingTimer )
+  if( mFadeInAnimation )
   {
-    mAutoRepeatingTimer.Reset();
+    mFadeInAnimation.Clear();
+    mFadeInAnimation.Reset();
   }
+}
 
-  mPainter = NULL;
+void PushButton::AddToFadeOutAnimation( const Actor& actor )
+{
+  if( !mFadeOutAnimation )
+  {
+    mFadeOutAnimation = Dali::Animation::New( GetAnimationTime() );
+  }
+
+  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, int priority )
 {
-  // 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() )
+    {
+      if( priority > -1 )
+      {
+        Self().Insert( priority, image );
+      }
+      else
+      {
+        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