X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fcheck-box-button-impl.h;h=e80b8385836d64147b10d4c2a792d9cf7fb315c0;hb=408a61e446173b2ede857332db1c4587b3f4c230;hp=aacf221b5d58aaa7e9d87e717e77f65c5d4e270d;hpb=4eb683ee97fc0d8a7278b50252a467b843f869df;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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 aacf221..e80b838 100644
--- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
@@ -20,12 +20,11 @@
 
 // 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>
 
 #include "button-impl.h"
 
@@ -65,55 +64,43 @@ private:
    */
   virtual ~CheckBoxButton();
 
-private: // From Button
-
-
   /**
-   * @copydoc Toolkit::Internal::Button::OnButtonInitialize()
+   * Setup the ticking effect to the selected image.
    */
-  virtual void OnButtonInitialize();
+  void SetTickUVEffect();
+
+private: // From Button
 
-  /**
-   * @copydoc Toolkit::Internal::Button::OnLabelSet()
-   */
-  virtual void OnLabelSet();
 
   /**
-   * @copydoc Toolkit::Internal::Button::OnSelected()
+   * @copydoc Toolkit::Internal::Button::OnButtonInitialize
    */
-  virtual bool OnSelected();
+  virtual void OnButtonInitialize();
 
   /**
-   * @copydoc Toolkit::Internal::Button::OnDisabled()
+   * @copydoc Toolkit::Internal::Button::OnLabelSet
    */
-  virtual bool OnDisabled();
+  virtual void OnLabelSet( bool noPadding );
 
   /**
-   * @copydoc Toolkit::Internal::Button::StopAllAnimations()
+   * @copydoc Toolkit::Internal::Button::OnDisabled
    */
-  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:
 
@@ -124,8 +111,7 @@ private:
   CheckBoxButton& operator=( const CheckBoxButton& );
 
 private:
-  Animation                 mTransitionAnimation;  ///< Animation used in the state transitions.
-  ShaderEffect              mTickUVEffect;         ///< ImageRegionEffect to expand the tick across
+  Actor         mSelectedImage;
 };
 
 } // namespace Internal