X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fcheck-box-button-impl.h;h=daee5977c16ef926e28eb6b1cc6e57af0f9e43ed;hb=fb545906ceea3a2946c8a451f34ea7da283c4ffe;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..daee597 100644 --- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h +++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -20,9 +20,6 @@ // EXTERNAL INCLUDES #include -#include -#include - // INTERNAL INCLUDES #include @@ -69,51 +66,9 @@ private: // From Button /** - * @copydoc Toolkit::Internal::Button::OnButtonInitialize() - */ - virtual void OnButtonInitialize(); - - /** - * @copydoc Toolkit::Internal::Button::OnLabelSet() - */ - 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: - - /** - * 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::OnInitialize */ - void StartTransitionAnimation( Actor& actor ); - - /** - * Stops the transition animation. - * @param[in] remove If true, removes the fadeout actor from root. - */ - void StopTransitionAnimation( bool remove = true ); - - // slots - - /** - * Called when the transition animation finishes. - */ - void TransitionAnimationFinished( Dali::Animation& source ); + virtual void OnInitialize(); private: @@ -123,9 +78,6 @@ private: // Undefined CheckBoxButton& operator=( const CheckBoxButton& ); -private: - Animation mTransitionAnimation; ///< Animation used in the state transitions. - ShaderEffect mTickUVEffect; ///< ImageRegionEffect to expand the tick across }; } // namespace Internal