Size negotiation patch 3: Scope size negotiation enums
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / buttons / push-button-impl.cpp
index bd26b23..cf34f85 100644 (file)
@@ -23,7 +23,7 @@
 #include <dali/public-api/object/type-registry.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/relayout-helper.h>
+#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
 
 namespace Dali
 {
@@ -38,11 +38,6 @@ 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()
@@ -58,24 +53,18 @@ namespace
 {
 
 /**
- * Find the first image actor in the actor hierarchy
+ * 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
  */
-ImageActor FindImageActor( Actor root )
+void SizeOfActorIfLarger( Actor root, Vector3& size )
 {
-  ImageActor imageActor = ImageActor::DownCast( root );
-  if( !imageActor && root )
+  if ( root )
   {
-    for( unsigned int i = 0, numChildren = root.GetChildCount(); i < numChildren; ++i )
-    {
-      ImageActor childImageActor = FindImageActor( root.GetChildAt( i ) );
-      if( childImageActor )
-      {
-        return childImageActor;
-      }
-    }
+    // RelayoutSize retreived for Actor to use any padding set to it.
+    size.width = std::max( root.GetRelayoutSize( Dimension::WIDTH ), size.width );
+    size.height = std::max( root.GetRelayoutSize( Dimension::HEIGHT ), size.height );
   }
-
-  return imageActor;
 }
 
 } // unnamed namespace
@@ -97,8 +86,7 @@ Dali::Toolkit::PushButton PushButton::New()
 
 PushButton::PushButton()
 : Button(),
-  mSize(),
-  mPaintState( UnselectedState )
+  mSize()
 {
   SetAnimationTime( ANIMATION_TIME );
 }
@@ -107,477 +95,170 @@ PushButton::~PushButton()
 {
 }
 
-void PushButton::SetButtonImage( Actor image )
+void PushButton::OnButtonInitialize()
 {
-  Actor& buttonImage = GetButtonImage();
-  Actor& fadeOutButtonImage = GetFadeOutButtonImage();
-
-  switch( mPaintState )
-  {
-    case UnselectedState:
-    {
-      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();
-
-      // Replaces the button image.
-      buttonImage = image;
-
-      Self().Add( buttonImage );
-      FadeOutImage( Foreground, buttonImage, opacity );
-
-      StartFadeOutAnimation();
-      break;
-    }
-    case SelectedUnselectedTransition: // FALLTHROUGH
-    case DisabledUnselectedTransition:
-    {
-      StopFadeInAnimation();
-      Self().Remove( buttonImage );
-
-      buttonImage = image;
-
-      FadeInImage( buttonImage );
-      StartFadeInAnimation();
-      break;
-    }
-    default:
-      buttonImage = image;
-      break;
-  }
+  // Push button requires the Leave event.
+  Actor self = Self();
+  self.SetLeaveRequired( true );
 
-  buttonImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-  buttonImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
-  buttonImage.SetPosition( 0.f, 0.f, FOREGROUND_DEPTH );
-  buttonImage.SetSizeMode( SIZE_EQUAL_TO_PARENT );
+  // Set resize policy to natural size so that buttons will resize to background images
+  self.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
 }
 
-void PushButton::SetSelectedImage( Actor image )
+void PushButton::OnLabelSet()
 {
-  Actor& selectedImage = GetSelectedImage();
-  Actor& fadeOutButtonImage = GetFadeOutButtonImage();
+  Actor& label = GetLabel();
 
-  switch( mPaintState )
+  if( label )
   {
-    case SelectedState:
-    {
-      if( selectedImage && selectedImage.GetParent() )
-      {
-        StopFadeOutAnimation();
-        FadeOutImage( Foreground, selectedImage  );
-
-        selectedImage = image;
-
-        FadeInImage( selectedImage );
-
-        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 );
+    label.SetAnchorPoint( AnchorPoint::CENTER );
+    label.SetParentOrigin( ParentOrigin::CENTER );
+    label.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
 
-      StartFadeOutAnimation();
-      break;
-    }
-    case UnselectedSelectedTransition: // FALLTHROUGH
-    case DisabledSelectedTransition:
+    Toolkit::TextLabel textLabel = Toolkit::TextLabel::DownCast( label );
+    if( textLabel )
     {
-      StopFadeInAnimation();
-      Self().Remove( selectedImage );
-
-      selectedImage = image;
-
-      FadeInImage( selectedImage );
-      StartFadeInAnimation();
-      break;
+      textLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
+      textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
+      textLabel.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, true );
     }
-    default:
-      selectedImage = image;
-      break;
   }
-
-  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::SetBackgroundImage( Actor image )
+void PushButton::OnButtonImageSet()
 {
-  Actor& backgroundImage = GetBackgroundImage();
-  Actor& fadeOutBackgroundImage = GetFadeOutBackgroundImage();
-
-  switch( mPaintState )
-  {
-    case UnselectedState:             // FALLTHROUGH
-    case SelectedState:
-    case UnselectedSelectedTransition:
-    case SelectedUnselectedTransition:
-    {
-      if( backgroundImage && backgroundImage.GetParent() )
-      {
-        StopFadeOutAnimation();
-        FadeOutImage( Background, backgroundImage  );
-
-        backgroundImage = image;
-
-        FadeInImage( backgroundImage );
-
-        StartFadeOutAnimation();
-        StartFadeInAnimation();
-      }
-      else
-      {
-        backgroundImage = image;
-        Self().Add( backgroundImage );
-      }
-      break;
-    }
-    case UnselectedDisabledTransition: // FALLTHROUGH
-    case SelectedDisabledTransition:
-    {
-      float opacity = 1.f;
-      if( fadeOutBackgroundImage )
-      {
-        opacity = fadeOutBackgroundImage.GetCurrentOpacity();
-      }
-      StopFadeOutAnimation();
-
-      // Replaces the button image.
-      backgroundImage = image;
-
-      Self().Add( backgroundImage );
-      FadeOutImage( Background, backgroundImage, opacity );
+  Actor& buttonImage = GetButtonImage();
 
-      StartFadeOutAnimation();
-      break;
-    }
-    case DisabledUnselectedTransition: // FALLTHROUGH
-    case DisabledSelectedTransition:
-    {
-      StopFadeInAnimation();
-      Self().Remove( backgroundImage );
+  buttonImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
 
-      backgroundImage = image;
+  buttonImage.RelayoutRequestTree();
 
-      FadeInImage( backgroundImage );
-      StartFadeInAnimation();
-      break;
-    }
-    default:
-      backgroundImage = image;
-      break;
-    }
-
-  backgroundImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-  backgroundImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
-  backgroundImage.SetPosition( 0.f, 0.f, BACKGROUND_DEPTH );
-  backgroundImage.SetSizeMode( SIZE_EQUAL_TO_PARENT );
+  RelayoutRequest();
 }
 
-void PushButton::SetDisabledImage( Actor image )
+void PushButton::OnSelectedImageSet()
 {
-  Actor& disabledImage = GetDisabledImage();
-  Actor& fadeOutButtonImage = GetFadeOutButtonImage();
-
-  switch( mPaintState )
-  {
-    case DisabledUnselectedState: // FALLTHROUGH
-    case DisabledSelectedState:
-    {
-      if( disabledImage && disabledImage.GetParent() )
-      {
-        StopFadeOutAnimation();
-        FadeOutImage( Foreground, disabledImage  );
-
-        disabledImage = image;
-
-        FadeInImage( disabledImage );
-
-        StartFadeOutAnimation();
-        StartFadeInAnimation();
-      }
-      else
-      {
-        disabledImage = image;
-        Self().Add( disabledImage );
-      }
-      break;
-    }
-    case UnselectedDisabledTransition: // FALLTHROUGH
-    case SelectedDisabledTransition:
-    {
-      StopFadeInAnimation();
-      Self().Remove( disabledImage );
-
-      disabledImage = image;
-
-      FadeInImage( disabledImage );
-      StartFadeInAnimation();
-      break;
-    }
-    case DisabledUnselectedTransition: // FALLTHROUGH
-    case DisabledSelectedTransition:
-    {
-      float opacity = 1.f;
-      if( fadeOutButtonImage )
-      {
-        opacity = fadeOutButtonImage.GetCurrentOpacity();
-      }
-      StopFadeOutAnimation();
-
-      // Replaces the button image.
-      disabledImage = image;
+  Actor& selectedImage = GetSelectedImage();
 
-      Self().Add( disabledImage );
-      FadeOutImage( Foreground, disabledImage, opacity );
+  selectedImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
 
-      StartFadeOutAnimation();
-      break;
-    }
-    default:
-      disabledImage = image;
-      break;
-  }
+  selectedImage.RelayoutRequestTree();
 
-  disabledImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-  disabledImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
-  disabledImage.SetPosition( 0.f, 0.f, FOREGROUND_DEPTH );
-  disabledImage.SetSizeMode( SIZE_EQUAL_TO_PARENT );
+  RelayoutRequest();
 }
 
-void PushButton::SetDisabledBackgroundImage( Actor image )
+void PushButton::OnBackgroundImageSet()
 {
-  Actor& disabledBackgroundImage = GetDisabledBackgroundImage();
-  Actor& fadeOutBackgroundImage = GetFadeOutBackgroundImage();
-
-  switch( mPaintState )
-  {
-    case DisabledUnselectedState: // FALLTHROUGH
-    case DisabledSelectedState:
-    {
-      if( disabledBackgroundImage && disabledBackgroundImage.GetParent() )
-      {
-        StopFadeOutAnimation();
-        FadeOutImage( Background, disabledBackgroundImage  );
+  Actor& backgroundImage = GetBackgroundImage();
 
-        disabledBackgroundImage = image;
+  backgroundImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
 
-        FadeInImage( disabledBackgroundImage );
+  backgroundImage.RelayoutRequestTree();
 
-        StartFadeOutAnimation();
-        StartFadeInAnimation();
-      }
-      else
-      {
-        disabledBackgroundImage = image;
-        Self().Add( disabledBackgroundImage );
-      }
-      break;
-    }
-    case UnselectedDisabledTransition: // FALLTHROUGH
-    case SelectedDisabledTransition:
-    {
-      StopFadeInAnimation();
-      Self().Remove( disabledBackgroundImage );
+  RelayoutRequest();
+}
 
-      disabledBackgroundImage = image;
+void PushButton::OnSelectedBackgroundImageSet()
+{
+  Actor& selectedBackgroundImage = GetSelectedBackgroundImage();
 
-      FadeInImage( disabledBackgroundImage );
-      StartFadeInAnimation();
-      break;
-    }
-    case DisabledUnselectedTransition: // FALLTHROUGH
-    case DisabledSelectedTransition:
-    {
-      float opacity = 1.f;
-      if( fadeOutBackgroundImage )
-      {
-        opacity = fadeOutBackgroundImage.GetCurrentOpacity();
-      }
-      StopFadeOutAnimation();
+  selectedBackgroundImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
+}
 
-      // Replaces the button image.
-      disabledBackgroundImage = image;
+void PushButton::OnDisabledImageSet()
+{
+  Actor& disabledImage = GetDisabledImage();
 
-      Self().Add( disabledBackgroundImage );
-      FadeOutImage( Background, disabledBackgroundImage, opacity );
+  disabledImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
 
-      StartFadeOutAnimation();
-      break;
-    }
-    default:
-      disabledBackgroundImage = image;
-      break;
-  }
+  disabledImage.RelayoutRequestTree();
 
-  disabledBackgroundImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-  disabledBackgroundImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
-  disabledBackgroundImage.SetPosition( 0.f, 0.f, BACKGROUND_DEPTH );
-  disabledBackgroundImage.SetSizeMode( SIZE_EQUAL_TO_PARENT );
+  RelayoutRequest();
 }
 
-void PushButton::OnButtonInitialize()
+void PushButton::OnDisabledBackgroundImageSet()
 {
-  // Push button requires the Leave event.
-  Actor root = Self();
-  root.SetLeaveRequired( true );
-}
+  Actor& disabledBackgroundImage = GetDisabledBackgroundImage();
 
-void PushButton::OnLabelSet()
-{
-  Actor& label = GetLabel();
+  disabledBackgroundImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
 
-  if( label )
-  {
-    label.SetAnchorPoint( AnchorPoint::CENTER );
-    label.SetParentOrigin( ParentOrigin::CENTER );
-    label.SetPosition( 0.f, 0.f, LABEL_DEPTH );
-    label.SetSize( mSize );
+  disabledBackgroundImage.RelayoutRequestTree();
 
-    Self().Add( label );
-  }
+  RelayoutRequest();
 }
 
-void PushButton::OnSelected( bool selected )
+bool PushButton::OnSelected()
 {
-  Actor& selectedImage = GetSelectedImage();
   Actor& buttonImage = GetButtonImage();
-  Actor& fadeOutButtonImage = GetFadeOutButtonImage();
+  Actor& selectedImage = GetSelectedImage();
+  Actor& selectedBackgroundImage = GetSelectedBackgroundImage();
 
-  switch( mPaintState )
+  PaintState paintState = GetPaintState();
+
+  switch( paintState )
   {
     case UnselectedState:
     {
-      StopFadeOutAnimation();
-      FadeOutImage( Foreground, buttonImage );
+      FadeOutImage( buttonImage );
+      FadeInImage( selectedBackgroundImage );
       FadeInImage( selectedImage );
-      StartFadeOutAnimation();
-      StartFadeInAnimation();
-
-      if( buttonImage || selectedImage )
-      {
-        mPaintState = UnselectedSelectedTransition;
-      }
-      else
-      {
-        mPaintState = SelectedState;
-      }
+      StartTransitionAnimation();
       break;
     }
     case SelectedState:
     {
-      StopFadeOutAnimation();
-      FadeOutImage( Foreground, selectedImage );
+      FadeOutImage( selectedBackgroundImage );
+      FadeOutImage( selectedImage );
       FadeInImage( buttonImage );
-      StartFadeOutAnimation();
-      StartFadeInAnimation();
-
-      if( buttonImage || selectedImage )
-      {
-        mPaintState = SelectedUnselectedTransition;
-      }
-      else
-      {
-        mPaintState = UnselectedState;
-      }
+      StartTransitionAnimation();
       break;
     }
     case UnselectedSelectedTransition:
     {
       float opacity = 1.f;
-      if( fadeOutButtonImage )
+      if( selectedImage )
       {
-        opacity = fadeOutButtonImage.GetCurrentOpacity();
+        opacity = selectedImage.GetCurrentOpacity();
       }
-      StopFadeOutAnimation( false );
-      StopFadeInAnimation();
-
-      FadeOutImage( Foreground, selectedImage, 1.f - opacity );
-      FadeInImage( buttonImage, opacity );
 
-      StartFadeOutAnimation();
-      StartFadeInAnimation();
-
-      if( buttonImage || selectedImage )
-      {
-        mPaintState = SelectedUnselectedTransition;
-      }
-      else
-      {
-        mPaintState = UnselectedState;
-      }
+      StopTransitionAnimation( false );
+      FadeOutImage( selectedBackgroundImage, opacity );
+      FadeOutImage( selectedImage, opacity );
+      FadeInImage( buttonImage, 1.f - opacity );
+      StartTransitionAnimation();
       break;
     }
     case SelectedUnselectedTransition:
     {
       float opacity = 0.f;
-      if( fadeOutButtonImage )
+      if( selectedImage )
       {
-        opacity = 1.f - fadeOutButtonImage.GetCurrentOpacity();
+        opacity = selectedImage.GetCurrentOpacity();
       }
-      StopFadeOutAnimation( false );
-      StopFadeInAnimation();
 
-      FadeOutImage( Foreground, buttonImage, 1.f - opacity );
+      StopTransitionAnimation( false );
+      FadeOutImage( buttonImage, 1.f - opacity );
+      FadeInImage( selectedBackgroundImage, opacity );
       FadeInImage( selectedImage, opacity );
-
-      StartFadeOutAnimation();
-      StartFadeInAnimation();
-
-      if( buttonImage || selectedImage )
-      {
-        mPaintState = UnselectedSelectedTransition;
-      }
-      else
-      {
-        mPaintState = SelectedState;
-      }
+      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:
@@ -585,419 +266,282 @@ void PushButton::OnSelected( bool selected )
       break;
     }
   }
+
+  if( mTransitionAnimation )
+  {
+    return true;
+  }
+
+  return false;
 }
 
-void PushButton::OnDisabled( bool disabled )
+bool PushButton::OnDisabled()
 {
   Actor& buttonImage = GetButtonImage();
   Actor& selectedImage = GetSelectedImage();
+  Actor& selectedBackgroundImage = GetSelectedBackgroundImage();
   Actor& backgroundImage = GetBackgroundImage();
   Actor& disabledImage = GetDisabledImage();
+  Actor& disabledSelectedImage = GetDisabledSelectedImage();
   Actor& disabledBackgroundImage = GetDisabledBackgroundImage();
-  Actor& fadeOutButtonImage = GetFadeOutButtonImage();
 
-  switch( mPaintState )
-  {
-  case UnselectedState:
+  PaintState paintState = GetPaintState();
+
+  switch( paintState )
   {
-    if( disabled )
+    case UnselectedState:
     {
-      StopFadeOutAnimation();
-      FadeOutImage( Background, backgroundImage );
-      FadeOutImage( Foreground, buttonImage );
+      FadeOutImage( backgroundImage );
+      FadeOutImage( buttonImage );
       FadeInImage( disabledBackgroundImage );
       FadeInImage( disabledImage );
-      StartFadeOutAnimation();
-      StartFadeInAnimation();
-
-      if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
-      {
-        mPaintState = UnselectedDisabledTransition;
-      }
-      else
-      {
-        mPaintState = DisabledUnselectedState;
-      }
+      StartTransitionAnimation();
+      break;
     }
-    break;
-  }
-  case SelectedState:
-  {
-    if( disabled )
+    case SelectedState:
     {
-      StopFadeOutAnimation();
-      FadeOutImage( Background, backgroundImage );
-      FadeOutImage( Foreground, selectedImage );
+      FadeOutImage( backgroundImage );
+      FadeOutImage( selectedBackgroundImage );
+      FadeOutImage( selectedImage );
       FadeInImage( disabledBackgroundImage );
-      FadeInImage( disabledImage );
-      StartFadeOutAnimation();
-      StartFadeInAnimation();
-
-      if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
-      {
-        mPaintState = SelectedDisabledTransition;
-      }
-      else
-      {
-        mPaintState = DisabledSelectedState;
-      }
+      FadeInImage( disabledSelectedImage );
+      StartTransitionAnimation();
+      break;
     }
-    break;
-  }
-  case DisabledUnselectedState:
-  {
-    if( !disabled )
+    case DisabledUnselectedState:
     {
-      StopFadeOutAnimation();
-      FadeOutImage( Background, disabledBackgroundImage );
-      FadeOutImage( Foreground, disabledImage );
+      FadeOutImage( disabledBackgroundImage );
+      FadeOutImage( disabledImage );
       FadeInImage( backgroundImage );
       FadeInImage( buttonImage );
-      StartFadeOutAnimation();
-      StartFadeInAnimation();
-
-      if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
-      {
-        mPaintState = DisabledUnselectedTransition;
-      }
-      else
-      {
-        mPaintState = UnselectedState;
-      }
+      StartTransitionAnimation();
+      break;
     }
-    break;
-  }
-  case DisabledSelectedState:
-  {
-    if( !disabled )
+    case DisabledSelectedState:
     {
-      StopFadeOutAnimation();
-      FadeOutImage( Background, disabledBackgroundImage );
-      FadeOutImage( Foreground, disabledImage );
+      FadeOutImage( disabledBackgroundImage );
+      FadeOutImage( disabledSelectedImage );
       FadeInImage( backgroundImage );
+      FadeInImage( selectedBackgroundImage );
       FadeInImage( selectedImage );
-      StartFadeOutAnimation();
-      StartFadeInAnimation();
-
-      if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
-      {
-        mPaintState = DisabledSelectedTransition;
-      }
-      else
-      {
-        mPaintState = SelectedState;
-      }
+      StartTransitionAnimation();
+      break;
     }
-    break;
-  }
-  case UnselectedSelectedTransition:
-  {
-    if( disabled )
+    case UnselectedSelectedTransition:
     {
       float opacity = 1.f;
-      if( fadeOutButtonImage )
+      if( selectedImage )
       {
-        opacity = fadeOutButtonImage.GetCurrentOpacity();
+        opacity = selectedImage.GetCurrentOpacity();
       }
-      StopFadeOutAnimation();
-      StopFadeInAnimation();
 
-      FadeOutImage( Foreground, selectedImage, 1.f - opacity );
-      FadeOutImage( Background, backgroundImage );
-
-      FadeInImage( disabledImage );
+      StopTransitionAnimation();
+      FadeOutImage( backgroundImage );
+      FadeOutImage( selectedBackgroundImage, opacity );
+      FadeOutImage( selectedImage, opacity );
       FadeInImage( disabledBackgroundImage );
-
-      StartFadeOutAnimation();
-      StartFadeInAnimation();
-
-      if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
-      {
-        mPaintState = SelectedDisabledTransition;
-      }
-      else
-      {
-        mPaintState = DisabledSelectedState;
-      }
+      FadeInImage( disabledSelectedImage );
+      StartTransitionAnimation();
+      break;
     }
-    break;
-  }
-  case SelectedUnselectedTransition:
-  {
-    if( disabled )
+    case SelectedUnselectedTransition:
     {
       float opacity = 1.f;
-      if( fadeOutButtonImage )
+      if( buttonImage )
       {
-        opacity = fadeOutButtonImage.GetCurrentOpacity();
+        opacity = buttonImage.GetCurrentOpacity();
       }
-      StopFadeOutAnimation();
-      StopFadeInAnimation();
 
-      FadeOutImage( Foreground, buttonImage, 1.f - opacity );
-      FadeOutImage( Background, backgroundImage );
-
-      FadeInImage( disabledImage );
+      StopTransitionAnimation();
+      FadeOutImage( backgroundImage );
+      FadeOutImage( buttonImage, opacity );
       FadeInImage( disabledBackgroundImage );
-
-      StartFadeOutAnimation();
-      StartFadeInAnimation();
-
-      if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
-      {
-        mPaintState = UnselectedDisabledTransition;
-      }
-      else
-      {
-        mPaintState = DisabledUnselectedState;
-      }
+      FadeInImage( disabledImage );
+      StartTransitionAnimation();
+      break;
     }
-    break;
-  }
-  case UnselectedDisabledTransition:
-  {
-    if( !disabled )
+    case UnselectedDisabledTransition:
     {
       float opacity = 1.f;
-      if( fadeOutButtonImage )
+      if( disabledImage )
       {
-        opacity = fadeOutButtonImage.GetCurrentOpacity();
+        opacity = disabledImage.GetCurrentOpacity();
       }
-      StopFadeOutAnimation( false );
-      StopFadeInAnimation();
-
-      FadeOutImage( Foreground, disabledImage, 1.f - opacity );
-      FadeOutImage( Background, disabledBackgroundImage, 1.f - opacity );
-      FadeInImage( buttonImage, opacity );
-      FadeInImage( backgroundImage, opacity );
 
-      StartFadeOutAnimation();
-      StartFadeInAnimation();
-
-      if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
-      {
-        mPaintState = DisabledUnselectedTransition;
-      }
-      else
-      {
-        mPaintState = UnselectedState;
-      }
+      StopTransitionAnimation( false );
+      FadeOutImage( disabledBackgroundImage, opacity );
+      FadeOutImage( disabledImage, opacity );
+      FadeInImage( backgroundImage, 1.f - opacity );
+      FadeInImage( buttonImage, 1.f - opacity );
+      StartTransitionAnimation();
+      break;
     }
-    break;
-  }
-  case DisabledUnselectedTransition:
-  {
-    if( disabled )
+    case DisabledUnselectedTransition:
     {
       float opacity = 1.f;
-      if( fadeOutButtonImage )
+      if( buttonImage )
       {
-        opacity = fadeOutButtonImage.GetCurrentOpacity();
+        opacity = buttonImage.GetCurrentOpacity();
       }
-      StopFadeOutAnimation( false );
-      StopFadeInAnimation();
-
-      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
-      {
-        mPaintState = DisabledUnselectedState;
-      }
+      StopTransitionAnimation( false );
+      FadeOutImage( backgroundImage, opacity );
+      FadeOutImage( buttonImage, opacity );
+      FadeInImage( disabledBackgroundImage, 1.f - opacity );
+      FadeInImage( disabledImage, 1.f - opacity );
+      StartTransitionAnimation();
+      break;
     }
-    break;
-  }
-  case SelectedDisabledTransition:
-  {
-    if( !disabled )
+    case SelectedDisabledTransition:
     {
       float opacity = 1.f;
-      if( fadeOutButtonImage )
+      if( disabledSelectedImage )
       {
-        opacity = fadeOutButtonImage.GetCurrentOpacity();
+        opacity = disabledSelectedImage.GetCurrentOpacity();
       }
-      StopFadeOutAnimation( false );
-      StopFadeInAnimation();
-
-      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;
-      }
+      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;
     }
-    break;
-  }
-  case DisabledSelectedTransition:
-  {
-    if( disabled )
+    case DisabledSelectedTransition:
     {
       float opacity = 1.f;
-      if( fadeOutButtonImage )
+      if( selectedImage )
       {
-        opacity = fadeOutButtonImage.GetCurrentOpacity();
+        opacity = selectedImage.GetCurrentOpacity();
       }
-      StopFadeOutAnimation( false );
-      StopFadeInAnimation();
-
-      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
-      {
-        mPaintState = DisabledSelectedState;
-      }
+      StopTransitionAnimation( false );
+      FadeOutImage( backgroundImage, opacity );
+      FadeOutImage( selectedBackgroundImage, opacity );
+      FadeOutImage( selectedImage, opacity );
+      FadeInImage( disabledBackgroundImage, 1.f - opacity );
+      FadeInImage( disabledSelectedImage, 1.f - opacity );
+      StartTransitionAnimation();
+      break;
     }
-    break;
   }
-  default:
-    break;
+
+  if( mTransitionAnimation )
+  {
+    return true;
   }
+
+  return false;
 }
 
-void PushButton::OnPressed()
+bool PushButton::OnPressed()
 {
-  Actor& selectedImage = GetSelectedImage();
   Actor& buttonImage = GetButtonImage();
-  Actor& fadeOutButtonImage = GetFadeOutButtonImage();
+  Actor& selectedImage = GetSelectedImage();
+  Actor& selectedBackgroundImage = GetSelectedBackgroundImage();
+
+  PaintState paintState = GetPaintState();
 
-  switch( mPaintState )
+  switch( paintState )
   {
     case UnselectedState:
     {
-      StopFadeOutAnimation();
-      FadeOutImage( Foreground, buttonImage );
+      FadeOutImage( buttonImage );
+      FadeInImage( selectedBackgroundImage );
       FadeInImage( selectedImage );
-      StartFadeOutAnimation();
-      StartFadeInAnimation();
-
-      if( buttonImage || selectedImage )
-      {
-        mPaintState = UnselectedSelectedTransition;
-      }
-      else
-      {
-        mPaintState = SelectedState;
-      }
+      StartTransitionAnimation();
       break;
     }
-    case UnselectedSelectedTransition:
+    case SelectedUnselectedTransition:
     {
-      if( !IsAutoRepeating() )
+      float opacity = 1.f;
+      if( buttonImage )
       {
-        mPaintState = SelectedUnselectedTransition;
+        opacity = buttonImage.GetCurrentOpacity();
       }
+
+      StopTransitionAnimation( false );
+      FadeOutImage( buttonImage, opacity );
+      FadeInImage( selectedBackgroundImage, 1.f - opacity );
+      FadeInImage( selectedImage, 1.f - opacity );
+      StartTransitionAnimation();
       break;
     }
-    case SelectedUnselectedTransition:
+    case DisabledUnselectedTransition:
     {
       float opacity = 1.f;
-      if( fadeOutButtonImage )
+      if( buttonImage )
       {
-        opacity = fadeOutButtonImage.GetCurrentOpacity();
+        opacity = buttonImage.GetCurrentOpacity();
       }
-      StopFadeOutAnimation( false );
-      StopFadeInAnimation();
-
-      FadeOutImage( Foreground, buttonImage, 1.f - opacity );
-      FadeInImage( selectedImage, opacity );
-
-      StartFadeOutAnimation();
-      StartFadeInAnimation();
 
-      if( buttonImage || selectedImage )
-      {
-        mPaintState = UnselectedSelectedTransition;
-      }
-      else
-      {
-        mPaintState = SelectedState;
-      }
+      StopTransitionAnimation();
+      FadeOutImage( buttonImage, opacity );
+      FadeInImage( selectedBackgroundImage );
+      FadeInImage( selectedImage );
+      StartTransitionAnimation();
       break;
     }
     default:
       break;
   }
+
+  if( mTransitionAnimation )
+  {
+    return true;
+  }
+
+  return false;
 }
 
-void PushButton::OnReleased()
+bool PushButton::OnReleased()
 {
-  Actor& selectedImage = GetSelectedImage();
   Actor& buttonImage = GetButtonImage();
-  Actor& fadeOutButtonImage = GetFadeOutButtonImage();
+  Actor& selectedImage = GetSelectedImage();
+  Actor& selectedBackgroundImage = GetSelectedBackgroundImage();
+
+  PaintState paintState = GetPaintState();
 
-  switch( mPaintState )
+  switch( paintState )
   {
     case SelectedState:
     {
-      StopFadeOutAnimation();
-      FadeOutImage( Foreground, selectedImage );
+      FadeOutImage( selectedBackgroundImage );
+      FadeOutImage( selectedImage );
       FadeInImage( buttonImage );
-      StartFadeOutAnimation();
-      StartFadeInAnimation();
-
-      if( buttonImage || selectedImage )
-      {
-        mPaintState = SelectedUnselectedTransition;
-      }
-      else
-      {
-        mPaintState = UnselectedState;
-      }
+      StartTransitionAnimation();
       break;
     }
     case UnselectedSelectedTransition:
     {
       float opacity = 1.f;
-      if( fadeOutButtonImage )
+      if( selectedImage )
       {
-        opacity = fadeOutButtonImage.GetCurrentOpacity();
+        opacity = selectedImage.GetCurrentOpacity();
       }
-      StopFadeOutAnimation( false );
-      StopFadeInAnimation();
-
-      FadeOutImage( Foreground, selectedImage, 1.f - opacity );
-      FadeInImage( buttonImage, opacity );
 
-      StartFadeOutAnimation();
-      StartFadeInAnimation();
-
-      if( buttonImage || selectedImage )
-      {
-        mPaintState = SelectedUnselectedTransition;
-      }
-      else
+      StopTransitionAnimation( false );
+      FadeOutImage( selectedBackgroundImage, opacity );
+      FadeOutImage( selectedImage, opacity );
+      FadeInImage( buttonImage, 1.f - opacity );
+      StartTransitionAnimation();
+      break;
+    }
+    case DisabledSelectedTransition:
+    {
+      float opacity = 1.f;
+      if( selectedImage )
       {
-        mPaintState = UnselectedState;
+        opacity = selectedImage.GetCurrentOpacity();
       }
+
+      StopTransitionAnimation();
+      FadeOutImage( selectedBackgroundImage, opacity );
+      FadeOutImage( selectedImage, opacity );
+      FadeInImage( buttonImage );
+      StartTransitionAnimation();
       break;
     }
     default:
@@ -1005,11 +549,18 @@ void PushButton::OnReleased()
       break;
     }
   }
+
+  if( mTransitionAnimation )
+  {
+    return true;
+  }
+
+  return false;
 }
 
-void PushButton::OnClicked()
+void PushButton::StopAllAnimations()
 {
-  OnReleased();
+  StopTransitionAnimation();
 }
 
 void PushButton::OnControlSizeSet( const Vector3& targetSize )
@@ -1029,249 +580,83 @@ void PushButton::OnControlSizeSet( const Vector3& targetSize )
 
 Vector3 PushButton::GetNaturalSize()
 {
-  Vector3 size = Control::GetNaturalSize();
+  Vector3 size;
 
-  const bool widthIsZero = EqualsZero( size.width );
-  const bool heightIsZero = EqualsZero( size.height );
+  // Check Image and Background image and use the largest size as the control's Natural size.
+  SizeOfActorIfLarger( GetButtonImage(), size );
+  SizeOfActorIfLarger( GetBackgroundImage(), size );
 
-  if( widthIsZero || heightIsZero )
+  // If label, test against it's size
+  Toolkit::TextLabel label = Toolkit::TextLabel::DownCast( GetLabel() );
+  if( label )
   {
-    // If background and background not scale9 try get size from that
-    ImageActor imageActor = FindImageActor( GetButtonImage() );
-    if( imageActor && imageActor.GetStyle() != ImageActor::STYLE_NINE_PATCH )
-    {
-      Vector3 imageSize = RelayoutHelper::GetNaturalSize( imageActor );
-
-      if( widthIsZero )
-      {
-        size.width = imageSize.width;
-      }
-
-      if( heightIsZero )
-      {
-        size.height = imageSize.height;
-      }
-    }
-
-    ImageActor backgroundImageActor = FindImageActor( GetBackgroundImage() );
-    if( backgroundImageActor && backgroundImageActor.GetStyle() != ImageActor::STYLE_NINE_PATCH )
-    {
-      Vector3 imageSize = RelayoutHelper::GetNaturalSize( backgroundImageActor );
+    Vector3 labelSize = label.GetNaturalSize();
 
-      if( widthIsZero )
-      {
-        size.width = std::max( size.width, imageSize.width );
-      }
-
-      if( heightIsZero )
-      {
-        size.height = std::max( size.height, imageSize.height );
-      }
-    }
+    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 size;
 }
 
-Actor& PushButton::GetFadeOutButtonImage()
-{
-  return mFadeOutButtonContent;
-}
-
-Actor& PushButton::GetFadeOutBackgroundImage()
-{
-  return mFadeOutBackgroundContent;
-}
-
-void PushButton::AddToFadeInAnimation( const Actor& actor )
+void PushButton::StartTransitionAnimation()
 {
-  if( !mFadeInAnimation )
+  if( mTransitionAnimation )
   {
-    mFadeInAnimation = Dali::Animation::New( GetAnimationTime() );
+    mTransitionAnimation.FinishedSignal().Connect( this, &PushButton::TransitionAnimationFinished );
+    mTransitionAnimation.Play();
   }
-
-  mFadeInAnimation.OpacityTo( actor, 1.f );
 }
 
-void PushButton::StartFadeInAnimation()
+void PushButton::StopTransitionAnimation( bool remove )
 {
-  if( mFadeInAnimation )
+  if( mTransitionAnimation )
   {
-    mFadeInAnimation.FinishedSignal().Connect( this, &PushButton::FadeInAnimationFinished );
-    mFadeInAnimation.Play();
-  }
-}
-
-void PushButton::StopFadeInAnimation()
-{
-  if( mFadeInAnimation )
-  {
-    mFadeInAnimation.Clear();
-    mFadeInAnimation.Reset();
-  }
-}
-
-void PushButton::AddToFadeOutAnimation( const Actor& actor )
-{
-  if( !mFadeOutAnimation )
-  {
-    mFadeOutAnimation = Dali::Animation::New( GetAnimationTime() );
-  }
-
-  mFadeOutAnimation.OpacityTo( actor, 0.f );
-}
-
-void PushButton::StartFadeOutAnimation()
-{
-  if( mFadeOutAnimation )
-  {
-    mFadeOutAnimation.FinishedSignal().Connect( this, &PushButton::FadeOutAnimationFinished );
-    mFadeOutAnimation.Play();
-  }
-}
-
-void PushButton::StopFadeOutAnimation( bool remove )
-{
-  if( mFadeOutAnimation )
-  {
-    mFadeOutAnimation.Clear();
-    mFadeOutAnimation.Reset();
+    mTransitionAnimation.Clear();
+    mTransitionAnimation.Reset();
   }
 
   if( remove )
   {
-    Actor& fadeOutButtonImage = GetFadeOutButtonImage();
-    Actor& fadeOutBackgroundImage = GetFadeOutBackgroundImage();
-
-    if( fadeOutButtonImage && fadeOutButtonImage.GetParent() )
-    {
-      fadeOutButtonImage.GetParent().Remove( fadeOutButtonImage );
-    }
-
-    if( fadeOutBackgroundImage && fadeOutBackgroundImage.GetParent() )
-    {
-      fadeOutBackgroundImage.GetParent().Remove( fadeOutBackgroundImage );
-    }
-
-    fadeOutButtonImage.Reset();
-    fadeOutBackgroundImage.Reset();
+    UpdatePaintTransitionState();
   }
 }
 
-void PushButton::FadeInImage( Actor& image, float opacity )
+void PushButton::FadeInImage( Actor& image, float opacity, Vector3 scale )
 {
   if( image )
   {
     image.SetOpacity( opacity );
-    if( !image.GetParent() )
+    image.SetScale( scale );
+
+    if( !mTransitionAnimation )
     {
-      Self().Add( image );
+      mTransitionAnimation = Dali::Animation::New( GetAnimationTime() );
     }
 
-    AddToFadeInAnimation( image );
+    mTransitionAnimation.AnimateTo( Property( image, Actor::Property::COLOR_ALPHA ), 1.f );
   }
 }
 
-void PushButton::FadeOutImage( ImageLayer layer, Actor& image, float opacity )
+void PushButton::FadeOutImage( Actor& image, float opacity, Vector3 scale )
 {
   if( image )
   {
-    Actor& fadeOutButtonImage = GetFadeOutButtonImage();
-    Actor& fadeOutBackgroundImage = GetFadeOutBackgroundImage();
-
-    Actor& actorLayer = ( ( Background == layer ) ? fadeOutBackgroundImage : fadeOutButtonImage );
-
-    actorLayer = image;
-    actorLayer.SetOpacity( opacity );
-
-    AddToFadeOutAnimation( actorLayer );
-  }
-}
+    image.SetOpacity( opacity );
+    image.SetScale( scale );
 
-void PushButton::FadeOutAnimationFinished( Dali::Animation& source )
-{
-  switch( mPaintState )
-  {
-    case UnselectedSelectedTransition:
-    {
-      mPaintState = SelectedState;
-      break;
-    }
-    case SelectedUnselectedTransition:
+    if( !mTransitionAnimation )
     {
-      mPaintState = UnselectedState;
-      break;
-    }
-    case UnselectedDisabledTransition:
-    {
-      mPaintState = DisabledUnselectedState;
-      break;
+      mTransitionAnimation = Dali::Animation::New( GetAnimationTime() );
     }
-    case DisabledUnselectedTransition:
-    {
-      mPaintState = UnselectedState;
-      break;
-    }
-    case SelectedDisabledTransition:
-    {
-      mPaintState = DisabledSelectedState;
-      break;
-    }
-    case DisabledSelectedTransition:
-    {
-      mPaintState = SelectedState;
-      break;
-    }
-    default:
-    {
-      break;
-    }
-  }
 
-  StopFadeOutAnimation();
+    mTransitionAnimation.AnimateTo( Property( image, Actor::Property::COLOR_ALPHA ), 0.f );
+  }
 }
 
-void PushButton::FadeInAnimationFinished( Dali::Animation& source )
+void PushButton::TransitionAnimationFinished( Dali::Animation& source )
 {
-  switch( mPaintState )
-  {
-    case UnselectedSelectedTransition:
-    {
-      mPaintState = SelectedState;
-      break;
-    }
-    case SelectedUnselectedTransition:
-    {
-      mPaintState = UnselectedState;
-      break;
-    }
-    case UnselectedDisabledTransition:
-    {
-      mPaintState = DisabledUnselectedState;
-      break;
-    }
-    case DisabledUnselectedTransition:
-    {
-      mPaintState = UnselectedState;
-      break;
-    }
-    case SelectedDisabledTransition:
-    {
-      mPaintState = DisabledSelectedState;
-      break;
-    }
-    case DisabledSelectedTransition:
-    {
-      mPaintState = SelectedState;
-      break;
-    }
-    default:
-    {
-      break;
-    }
-  }
-
-  StopFadeInAnimation();
+  StopTransitionAnimation();
 }
 
 } // namespace Internal