X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fradio-button-impl.h;h=b1727502c673b2fbddfd3a04f638728d85c9849b;hb=b8da2e53925b9abb9fa362560069e8ca4aa62f81;hp=ba5a79e6d327a84bb29e7f5d8f74c473078bc032;hpb=1db0a8becea3dbdebaa942d934d91824a92434e7;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.h b/dali-toolkit/internal/controls/buttons/radio-button-impl.h
index ba5a79e..b172750 100644
--- a/dali-toolkit/internal/controls/buttons/radio-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H__
-#define __DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H__
+#ifndef DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H
+#define DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -19,10 +19,10 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/common/dali-vector.h>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 #include <dali-toolkit/public-api/controls/buttons/radio-button.h>
 #include "button-impl.h"
 
@@ -32,82 +32,62 @@ namespace Toolkit
 {
 namespace Internal
 {
-
 /**
  * RadioButton implementation class.
  *
  * \sa Dali::Toolkit::RadioButton
  */
-class RadioButton: public Button
+class RadioButton : public Button
 {
- public:
-
+public:
   /**
    * Create a new RadioButton.
    *
-   * @return A smart-pointer to the newly allocated PushButton.
+   * @return A smart-pointer to the newly allocated RadioButton.
    */
   static Dali::Toolkit::RadioButton New();
 
+private:
   /**
-   * Construct a new PushButton.
+   * Construct a new RadioButton.
    */
   RadioButton();
 
   /**
-   * Construct a new PushButton with label.
-   */
-  RadioButton( const std::string& label );
-
-  /**
-   * Construct a new PushButton with label.
-   */
-  RadioButton( Actor label );
-
-  /**
    * A reference counted object may only be deleted by calling Unreference()
    */
   virtual ~RadioButton();
 
+private: // From Button
   /**
-   * @copydoc Dali::Toolkit::Button::SetLabel( Actor label )
+   * @copydoc Toolkit::Internal::Button::OnInitialize
    */
-  virtual void SetLabel( Actor label );   // TODO: After refactoring painter, this will be removed
+  void OnInitialize() override;
 
   /**
-   * @copydoc Dali::Toolkit::Button::SetSelected( bool selected )
+   * @copydoc Toolkit::Internal::Button::OnStateChange
    */
-  virtual void SetSelected( bool selected );
+  void OnStateChange(State newState) override;
 
   /**
-   * @copydoc Dali::Toolkit::Control::OnRelayout()
+   * @copydoc Toolkit::Internal::Button::OnToggleReleased
    */
-  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
-
- protected: // From Control
-
-  /**
-   * Sets the relative position of image and label.
-   */
-  virtual void OnInitialize();
-
- protected: // From Button
-  /**
-   * Change button state when the button is pressed.
-   */
-  virtual void OnButtonUp();
-
- private:
+  bool OnToggleReleased() override;
 
+private:
   // Undefined
-  RadioButton( const RadioButton& origin );
+  RadioButton(const RadioButton& origin);
 
   // Undefined
-  RadioButton& operator=( const RadioButton& origin );
+  RadioButton& operator=(const RadioButton& origin);
+
+protected:
+  struct AccessibleImpl : public Button::AccessibleImpl
+  {
+    using Button::AccessibleImpl::AccessibleImpl;
 
-  Image mUnselectedImage;  ///< Stores the unselected image
-  Image mSelectedImage;    ///< Stores the selected image
-  ImageActor mRadioIcon;   ///< Stores the current image
+    Dali::Accessibility::States CalculateStates() override;
+  };
 };
 
 } // namespace Internal
@@ -120,7 +100,7 @@ inline Toolkit::Internal::RadioButton& GetImplementation(Toolkit::RadioButton& b
 
   Dali::RefObject& handle = button.GetImplementation();
 
-  return static_cast<Toolkit::Internal::RadioButton&> (handle);
+  return static_cast<Toolkit::Internal::RadioButton&>(handle);
 }
 
 inline const Toolkit::Internal::RadioButton& GetImplementation(const Toolkit::RadioButton& button)
@@ -129,10 +109,10 @@ inline const Toolkit::Internal::RadioButton& GetImplementation(const Toolkit::Ra
 
   const Dali::RefObject& handle = button.GetImplementation();
 
-  return static_cast<const Toolkit::Internal::RadioButton&> (handle);
+  return static_cast<const Toolkit::Internal::RadioButton&>(handle);
 }
 
 } // namespace Toolkit
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H__
+#endif // DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H