[AT-SPI] Squashed implementation

[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 06bb1c6..531b53b 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H__
-#define __DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H__
+#ifndef DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H
+#define DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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 <dali/public-api/common/dali-vector.h>
-#include <dali/public-api/animation/animation.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"
 
@@ -68,51 +66,9 @@ private: // From Button
 
 
   /**
-   * @copydoc Toolkit::Internal::Button::OnButtonInitialize()
+   * @copydoc Toolkit::Internal::Button::OnInitialize
    */
-  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.
-   */
-  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 );
+  void OnInitialize() override;
 
 private:
 
@@ -121,10 +77,14 @@ private:
 
   // Undefined
   CheckBoxButton& operator=( const CheckBoxButton& );
-
-private:
-  Animation                 mTransitionAnimation;  ///< Animation used in the state transitions.
-  ImageRegionEffect         mTickUVEffect;         ///< ImageRegionEffect to expand the tick across
+protected:
+  struct AccessibleImpl : public Button::AccessibleImpl
+  {
+    using Button::AccessibleImpl::AccessibleImpl;
+
+    Dali::Accessibility::States CalculateStates() override;
+  };
+  void OnStateChange( State newState ) override;
 };
 
 } // namespace Internal
@@ -153,4 +113,4 @@ inline const Toolkit::Internal::CheckBoxButton& GetImplementation( const Toolkit
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H__
+#endif // DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H