X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fpush-button-impl.cpp;h=24fa23070f2dc4f6e1bc991ba3c5f658d4edf8dd;hp=0df4e3cfdc827bd05c1832d2e1fa1546d4c233ad;hb=56d412791a44c2a79135d2293c13fddb135c9d54;hpb=2acdedcc7c7e732a9ec97d08c8cee7423ed6ebf7

diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
index 0df4e3c..24fa230 100644
--- a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
@@ -19,15 +19,11 @@
 #include "push-button-impl.h"
 
 // EXTERNAL INCLUDES
-#include <algorithm>
 #include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/object/type-registry.h>
 
 // INTERNAL INCLUDES
-#include "push-button-default-painter-impl.h"
-
-#include <dali-toolkit/public-api/controls/text-view/text-view.h>
-#include <dali-toolkit/internal/controls/relayout-helper.h>
+#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
 
 namespace Dali
 {
@@ -41,6 +37,9 @@ namespace Internal
 namespace
 {
 
+const float TEXT_PADDING = 12.0f;
+const float ANIMATION_TIME( 0.2f );
+
 BaseHandle Create()
 {
   return Toolkit::PushButton::New();
@@ -53,8 +52,6 @@ TypeRegistration typeRegistration( typeid(Toolkit::PushButton), typeid(Toolkit::
 namespace
 {
 
-const float TEXT_PADDING = 12.0f;
-
 /**
  * Find the first image actor in the actor hierarchy
  */
@@ -76,7 +73,6 @@ ImageActor FindImageActor( Actor root )
   return imageActor;
 }
 
-
 } // unnamed namespace
 
 Dali::Toolkit::PushButton PushButton::New()
@@ -94,89 +90,584 @@ Dali::Toolkit::PushButton PushButton::New()
   return pushButton;
 }
 
+PushButton::PushButton()
+: Button(),
+  mSize()
+{
+  SetAnimationTime( ANIMATION_TIME );
+}
+
+PushButton::~PushButton()
+{
+}
+
 void PushButton::OnButtonInitialize()
 {
   // Push button requires the Leave event.
-  Actor root = Self();
-  root.SetLeaveRequired( true );
+  Actor self = Self();
+  self.SetLeaveRequired( true );
+
+  // Set resize policy to natural size so that buttons will resize to background images
+  self.SetResizePolicy( USE_NATURAL_SIZE, ALL_DIMENSIONS );
 }
 
-PushButton::PushButton()
-: Button()
+void PushButton::OnLabelSet()
 {
-  // Creates specific painter.GetBu
-  ButtonPainterPtr painter = PushButtonDefaultPainterPtr( new PushButtonDefaultPainter() );
-  SetPainter( painter );
+  Actor& label = GetLabel();
+
+  if( label )
+  {
+    label.SetAnchorPoint( AnchorPoint::CENTER );
+    label.SetParentOrigin( ParentOrigin::CENTER );
+    label.SetSize( mSize );
+  }
 }
 
-PushButton::~PushButton()
+void PushButton::OnButtonImageSet()
 {
-  SetPainter( NULL );
+  Actor& buttonImage = GetButtonImage();
+
+  buttonImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+
+  buttonImage.RelayoutRequestTree();
+
+  RelayoutRequest();
 }
 
-Vector3 PushButton::GetNaturalSize()
+void PushButton::OnSelectedImageSet()
+{
+  Actor& selectedImage = GetSelectedImage();
+
+  selectedImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+
+  selectedImage.RelayoutRequestTree();
+
+  RelayoutRequest();
+}
+
+void PushButton::OnBackgroundImageSet()
+{
+  Actor& backgroundImage = GetBackgroundImage();
+
+  backgroundImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+
+  backgroundImage.RelayoutRequestTree();
+
+  RelayoutRequest();
+}
+
+void PushButton::OnSelectedBackgroundImageSet()
+{
+  Actor& selectedBackgroundImage = GetSelectedBackgroundImage();
+
+  selectedBackgroundImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+}
+
+void PushButton::OnDisabledImageSet()
+{
+  Actor& disabledImage = GetDisabledImage();
+
+  disabledImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+
+  disabledImage.RelayoutRequestTree();
+
+  RelayoutRequest();
+}
+
+void PushButton::OnDisabledBackgroundImageSet()
+{
+  Actor& disabledBackgroundImage = GetDisabledBackgroundImage();
+
+  disabledBackgroundImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+
+  disabledBackgroundImage.RelayoutRequestTree();
+
+  RelayoutRequest();
+}
+
+bool PushButton::OnSelected()
 {
-  Vector3 size = Control::GetNaturalSize();
+  Actor& buttonImage = GetButtonImage();
+  Actor& selectedImage = GetSelectedImage();
+  Actor& selectedBackgroundImage = GetSelectedBackgroundImage();
 
-  const bool widthIsZero = EqualsZero( size.width );
-  const bool heightIsZero = EqualsZero( size.height );
+  PaintState paintState = GetPaintState();
 
-  if( widthIsZero || heightIsZero )
+  switch( paintState )
   {
-    // If background and background not scale9 try get size from that
-    ImageActor imageActor = FindImageActor( GetButtonImage() );
-    if( imageActor && imageActor.GetStyle() != ImageActor::STYLE_NINE_PATCH )
+    case UnselectedState:
     {
-      Vector3 imageSize = RelayoutHelper::GetNaturalSize( imageActor );
+      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();
+      }
 
-      if( widthIsZero )
+      StopTransitionAnimation( false );
+      FadeOutImage( selectedBackgroundImage, opacity );
+      FadeOutImage( selectedImage, opacity );
+      FadeInImage( buttonImage, 1.f - opacity );
+      StartTransitionAnimation();
+      break;
+    }
+    case SelectedUnselectedTransition:
+    {
+      float opacity = 0.f;
+      if( selectedImage )
       {
-        size.width = imageSize.width;
+        opacity = selectedImage.GetCurrentOpacity();
       }
 
-      if( heightIsZero )
+      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;
+    }
+  }
+
+  if( mTransitionAnimation )
+  {
+    return true;
+  }
+
+  return false;
+}
+
+bool PushButton::OnDisabled()
+{
+  Actor& buttonImage = GetButtonImage();
+  Actor& selectedImage = GetSelectedImage();
+  Actor& selectedBackgroundImage = GetSelectedBackgroundImage();
+  Actor& backgroundImage = GetBackgroundImage();
+  Actor& disabledImage = GetDisabledImage();
+  Actor& disabledSelectedImage = GetDisabledSelectedImage();
+  Actor& disabledBackgroundImage = GetDisabledBackgroundImage();
+
+  PaintState paintState = GetPaintState();
+
+  switch( paintState )
+  {
+    case UnselectedState:
+    {
+      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 )
       {
-        size.height = imageSize.height;
+        opacity = selectedImage.GetCurrentOpacity();
       }
+
+      StopTransitionAnimation();
+      FadeOutImage( backgroundImage );
+      FadeOutImage( selectedBackgroundImage, opacity );
+      FadeOutImage( selectedImage, opacity );
+      FadeInImage( disabledBackgroundImage );
+      FadeInImage( disabledSelectedImage );
+      StartTransitionAnimation();
+      break;
     }
+    case SelectedUnselectedTransition:
+    {
+      float opacity = 1.f;
+      if( buttonImage )
+      {
+        opacity = buttonImage.GetCurrentOpacity();
+      }
 
-    ImageActor backgroundImageActor = FindImageActor( GetBackgroundImage() );
-    if( backgroundImageActor && backgroundImageActor.GetStyle() != ImageActor::STYLE_NINE_PATCH )
+      StopTransitionAnimation();
+      FadeOutImage( backgroundImage );
+      FadeOutImage( buttonImage, opacity );
+      FadeInImage( disabledBackgroundImage );
+      FadeInImage( disabledImage );
+      StartTransitionAnimation();
+      break;
+    }
+    case UnselectedDisabledTransition:
     {
-      Vector3 imageSize = RelayoutHelper::GetNaturalSize( backgroundImageActor );
+      float opacity = 1.f;
+      if( disabledImage )
+      {
+        opacity = disabledImage.GetCurrentOpacity();
+      }
 
-      if( widthIsZero )
+      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 )
       {
-        size.width = std::max( size.width, imageSize.width );
+        opacity = buttonImage.GetCurrentOpacity();
       }
 
-      if( heightIsZero )
+      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 )
       {
-        size.height = std::max( size.height, imageSize.height );
+        opacity = disabledSelectedImage.GetCurrentOpacity();
       }
+
+      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 )
+      {
+        opacity = selectedImage.GetCurrentOpacity();
+      }
 
-    // If label, test against it's size
-    Toolkit::TextView textView = Toolkit::TextView::DownCast( GetLabel() );
-    if( textView )
+      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;
+}
+
+bool PushButton::OnPressed()
+{
+  Actor& buttonImage = GetButtonImage();
+  Actor& selectedImage = GetSelectedImage();
+  Actor& selectedBackgroundImage = GetSelectedBackgroundImage();
+
+  PaintState paintState = GetPaintState();
+
+  switch( paintState )
+  {
+    case UnselectedState:
+    {
+      FadeOutImage( buttonImage );
+      FadeInImage( selectedBackgroundImage );
+      FadeInImage( selectedImage );
+      StartTransitionAnimation();
+      break;
+    }
+    case SelectedUnselectedTransition:
+    {
+      float opacity = 1.f;
+      if( buttonImage )
+      {
+        opacity = buttonImage.GetCurrentOpacity();
+      }
+
+      StopTransitionAnimation( false );
+      FadeOutImage( buttonImage, opacity );
+      FadeInImage( selectedBackgroundImage, 1.f - opacity );
+      FadeInImage( selectedImage, 1.f - opacity );
+      StartTransitionAnimation();
+      break;
+    }
+    case DisabledUnselectedTransition:
     {
-      Vector3 textViewSize = textView.GetNaturalSize();
+      float opacity = 1.f;
+      if( buttonImage )
+      {
+        opacity = buttonImage.GetCurrentOpacity();
+      }
+
+      StopTransitionAnimation();
+      FadeOutImage( buttonImage, opacity );
+      FadeInImage( selectedBackgroundImage );
+      FadeInImage( selectedImage );
+      StartTransitionAnimation();
+      break;
+    }
+    default:
+      break;
+  }
+
+  if( mTransitionAnimation )
+  {
+    return true;
+  }
+
+  return false;
+}
+
+bool PushButton::OnReleased()
+{
+  Actor& buttonImage = GetButtonImage();
+  Actor& selectedImage = GetSelectedImage();
+  Actor& selectedBackgroundImage = GetSelectedBackgroundImage();
+
+  PaintState paintState = GetPaintState();
 
-      if( widthIsZero )
+  switch( paintState )
+  {
+    case SelectedState:
+    {
+      FadeOutImage( selectedBackgroundImage );
+      FadeOutImage( selectedImage );
+      FadeInImage( buttonImage );
+      StartTransitionAnimation();
+      break;
+    }
+    case UnselectedSelectedTransition:
+    {
+      float opacity = 1.f;
+      if( selectedImage )
       {
-        size.width = std::max( size.width, textViewSize.width + TEXT_PADDING * 2.0f );
+        opacity = selectedImage.GetCurrentOpacity();
       }
 
-      if( heightIsZero )
+      StopTransitionAnimation( false );
+      FadeOutImage( selectedBackgroundImage, opacity );
+      FadeOutImage( selectedImage, opacity );
+      FadeInImage( buttonImage, 1.f - opacity );
+      StartTransitionAnimation();
+      break;
+    }
+    case DisabledSelectedTransition:
+    {
+      float opacity = 1.f;
+      if( selectedImage )
       {
-        size.height = std::max( size.height, textViewSize.height + TEXT_PADDING * 2.0f );
+        opacity = selectedImage.GetCurrentOpacity();
       }
+
+      StopTransitionAnimation();
+      FadeOutImage( selectedBackgroundImage, opacity );
+      FadeOutImage( selectedImage, opacity );
+      FadeInImage( buttonImage );
+      StartTransitionAnimation();
+      break;
+    }
+    default:
+    {
+      break;
     }
   }
 
+  if( mTransitionAnimation )
+  {
+    return true;
+  }
+
+  return false;
+}
+
+void PushButton::StopAllAnimations()
+{
+  StopTransitionAnimation();
+}
+
+void PushButton::OnControlSizeSet( const Vector3& targetSize )
+{
+  if( targetSize != mSize )
+  {
+    mSize = targetSize;
+
+    Actor& label = GetLabel();
+
+    if( label )
+    {
+      label.SetSize( mSize );
+    }
+  }
+}
+
+Vector3 PushButton::GetNaturalSize()
+{
+  Vector3 size;
+
+  // If background and background not scale9 try get size from that
+  ImageActor imageActor = FindImageActor( GetButtonImage() );
+  if( imageActor && imageActor.GetStyle() != ImageActor::STYLE_NINE_PATCH )
+  {
+    size.width = imageActor.GetRelayoutSize( WIDTH );
+    size.height = imageActor.GetRelayoutSize( HEIGHT );
+  }
+
+  ImageActor backgroundImageActor = FindImageActor( GetBackgroundImage() );
+  if( backgroundImageActor && backgroundImageActor.GetStyle() != ImageActor::STYLE_NINE_PATCH )
+  {
+    size.width = std::max( size.width, backgroundImageActor.GetRelayoutSize( WIDTH ) );
+    size.height = std::max( size.height, backgroundImageActor.GetRelayoutSize( HEIGHT ) );
+  }
+
+  // If label, test against it's size
+  Toolkit::TextLabel label = Toolkit::TextLabel::DownCast( GetLabel() );
+  if( label )
+  {
+    Vector3 labelSize = label.GetNaturalSize();
+
+    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;
 }
 
+void PushButton::StartTransitionAnimation()
+{
+  if( mTransitionAnimation )
+  {
+    mTransitionAnimation.FinishedSignal().Connect( this, &PushButton::TransitionAnimationFinished );
+    mTransitionAnimation.Play();
+  }
+}
+
+void PushButton::StopTransitionAnimation( bool remove )
+{
+  if( mTransitionAnimation )
+  {
+    mTransitionAnimation.Clear();
+    mTransitionAnimation.Reset();
+  }
+
+  if( remove )
+  {
+    UpdatePaintTransitionState();
+  }
+}
+
+void PushButton::FadeInImage( Actor& image, float opacity, Vector3 scale )
+{
+  if( image )
+  {
+    image.SetOpacity( opacity );
+    image.SetScale( scale );
+
+    if( !mTransitionAnimation )
+    {
+      mTransitionAnimation = Dali::Animation::New( GetAnimationTime() );
+    }
+
+    mTransitionAnimation.AnimateTo( Property( image, Actor::Property::COLOR_ALPHA ), 1.f );
+  }
+}
+
+void PushButton::FadeOutImage( Actor& image, float opacity, Vector3 scale )
+{
+  if( image )
+  {
+    image.SetOpacity( opacity );
+    image.SetScale( scale );
+
+    if( !mTransitionAnimation )
+    {
+      mTransitionAnimation = Dali::Animation::New( GetAnimationTime() );
+    }
+
+    mTransitionAnimation.AnimateTo( Property( image, Actor::Property::COLOR_ALPHA ), 0.f );
+  }
+}
+
+void PushButton::TransitionAnimationFinished( Dali::Animation& source )
+{
+  StopTransitionAnimation();
+}
+
 } // namespace Internal
 
 } // namespace Toolkit