Refactored Button and derived classes, moving state change and transition logic to...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / buttons / check-box-button-impl.h

diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
index 0135e6b..25945d2 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
@@ -20,10 +20,8 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
-#include <dali/public-api/animation/animation.h>
 #include <dali/public-api/shader-effects/shader-effect.h>
 
-
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/buttons/check-box-button.h>
 #include <dali-toolkit/devel-api/shader-effects/image-region-effect.h>
@@ -80,41 +78,24 @@ private: // From Button
   virtual void OnLabelSet();
 
   /**
-   * @copydoc Toolkit::Internal::Button::OnSelected()
-   */
-  virtual bool OnSelected();
-
-  /**
    * @copydoc Toolkit::Internal::Button::OnDisabled()
    */
-  virtual bool OnDisabled();
-
-  /**
-   * @copydoc Toolkit::Internal::Button::StopAllAnimations()
-   */
-  virtual void StopAllAnimations();
-
-private:
+  virtual void OnDisabled();
 
   /**
-   * Adds the actor to the transition animation.
-   * It creates a transition animation if needed and starts the animation.
-   * @param[in] actor The actor.
+   * @copydoc Toolkit::Internal::Button::PrepareForTranstionIn( Actor actor )
    */
-  void StartTransitionAnimation( Actor& actor );
+  virtual void PrepareForTranstionIn( Actor actor );
 
   /**
-   * Stops the transition animation.
-   * @param[in] remove If true, removes the fadeout actor from root.
+   * @copydoc Toolkit::Internal::Button::PrepareForTranstionOut( Actor actor )
    */
-  void StopTransitionAnimation( bool remove = true );
-
-  // slots
+  virtual void PrepareForTranstionOut( Actor actor );
 
   /**
-   * Called when the transition animation finishes.
+   * @copydoc Toolkit::Internal::Button::OnTransitionInImage( Actor actor )
    */
-  void TransitionAnimationFinished( Dali::Animation& source );
+  virtual void OnTransitionIn( Actor actor );
 
 private:
 
@@ -125,7 +106,6 @@ private:
   CheckBoxButton& operator=( const CheckBoxButton& );
 
 private:
-  Animation                 mTransitionAnimation;  ///< Animation used in the state transitions.
   ShaderEffect              mTickUVEffect;         ///< ImageRegionEffect to expand the tick across
 };