X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fcheck-box-button-impl.h;h=daee5977c16ef926e28eb6b1cc6e57af0f9e43ed;hp=9d4335a4a74d1d810dade2754e382685277a991c;hb=abbf60ed35112186269d2fe93b949eb8abd4283d;hpb=38a8b42e1f7765a9b3314a033700fb25d4a6f8fd 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 9d4335a..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,11 +20,9 @@ // EXTERNAL INCLUDES #include -#include // INTERNAL INCLUDES #include -#include #include "button-impl.h" @@ -52,52 +50,6 @@ public: */ static Dali::Toolkit::CheckBoxButton New(); -public: // From Button - - /** - * @copydoc Toolkit::Internal::Button::SetSelectedImage( Actor image ) - */ - virtual void SetSelectedImage( Actor image ); - - /** - * @copydoc Toolkit::Internal::Button::SetBackgroundImage( Actor image ) - */ - virtual void SetBackgroundImage( Actor image ); - - /** - * @copydoc Toolkit::Internal::Button::SetDisabledSelectedImage( Actor image ) - */ - virtual void SetDisabledSelectedImage( Actor image ); - - /** - * @copydoc Toolkit::Internal::Button::SetDisabledBackgroundImage( Actor image ) - */ - virtual void SetDisabledBackgroundImage( Actor image ); - -private: // From Button - - /** - * @copydoc Toolkit::Internal::Button::OnLabelSet() - */ - virtual void OnLabelSet(); - - /** - * @copydoc Toolkit::Internal::Button::OnSelected() - */ - virtual void OnSelected( bool selected ); - - /** - * @copydoc Toolkit::Internal::Button::OnDisabled( bool disabled ) - */ - virtual void OnDisabled( bool disabled ); - -private: // From Control - - /** - * @copydoc Dali::Toolkit::Control::OnRelayout() - */ - virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container ); - private: /** @@ -110,37 +62,13 @@ private: */ virtual ~CheckBoxButton(); -private: - - /** - * Adds the actor to the button. - */ - void AddChild( Actor& actor ); - - /** - * Removes the actor from the button. - */ - void RemoveChild( Actor& actor ); - - /** - * Adds the actor to the check in animation. - * It creates a check in animation if needed and starts the check in animation. - * @param[in] actor The actor. - */ - void StartCheckInAnimation( Actor& actor ); - - /** - * Stops the check in animation. - */ - void StopCheckInAnimation(); +private: // From Button - // slots /** - * Called when the check in animation finishes. - * It changes the check button paint state. + * @copydoc Toolkit::Internal::Button::OnInitialize */ - void CheckInAnimationFinished( Dali::Animation& source ); + virtual void OnInitialize(); private: @@ -150,11 +78,6 @@ private: // Undefined CheckBoxButton& operator=( const CheckBoxButton& ); -private: - Animation mCheckInAnimation; ///< Animation used in the state transitions. - ImageRegionEffect mTickUVEffect; ///< ImageRegionEffect to expand the tick across - - PaintState mPaintState; ///< The paint state. }; } // namespace Internal