New size negotiation

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / buttons / radio-button-impl.h

diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.h b/dali-toolkit/internal/controls/buttons/radio-button-impl.h
index dc31882..917f9fe 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/radio-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.h
@@ -25,6 +25,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 #include <dali-toolkit/public-api/controls/buttons/radio-button.h>
+#include <dali-toolkit/public-api/controls/table-view/table-view.h>
 #include "button-impl.h"
 
 namespace Dali
@@ -41,7 +42,7 @@ namespace Internal
  */
 class RadioButton: public Button
 {
- public:
+public:
 
   /**
    * Create a new RadioButton.
@@ -70,35 +71,50 @@ class RadioButton: public Button
    */
   virtual ~RadioButton();
 
+public: // From Button
+
   /**
-   * @copydoc Dali::Toolkit::Button::SetLabel( Actor label )
+   * @copydoc Toolkit::Internal::Button::SetButtonImage( Actor image )
    */
-  virtual void SetLabel( Actor label );   // TODO: After refactoring painter, this will be removed
+  virtual void SetButtonImage( Actor image );
 
   /**
-   * @copydoc Dali::Toolkit::Button::SetSelected( bool selected )
+   * @copydoc Toolkit::Internal::Button::SetSelectedImage( Actor image )
    */
-  virtual void SetSelected( bool selected );
+  virtual void SetSelectedImage( Actor image );
+
+private: // From Button
 
   /**
-   * @copydoc Dali::Toolkit::Control::OnRelayout()
+   * @copydoc Toolkit::Internal::Button::OnButtonInitialize()
    */
-  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
+  virtual void OnButtonInitialize();
 
- protected: // From Control
+  /**
+   * @copydoc Toolkit::Internal::Button::OnButtonUp()
+   */
+  virtual void OnButtonUp();
 
   /**
-   * Sets the relative position of image and label.
+   * @copydoc Toolkit::Internal::Button::OnSelected()
    */
-  virtual void OnInitialize();
+  virtual void OnSelected( bool selected );
 
- protected: // From Button
   /**
-   * Change button state when the button is pressed.
+   * @copydoc Toolkit::Internal::Button::OnLabelSet()
    */
-  virtual void OnButtonUp();
+  virtual void OnLabelSet();
 
- private:
+private:
+
+  /**
+   * @brief Set the image to display
+   *
+   * @param[in] image The image to set
+   */
+  void SetImage( Actor image );
+
+private:
 
   // Undefined
   RadioButton( const RadioButton& origin );
@@ -106,9 +122,10 @@ class RadioButton: public Button
   // Undefined
   RadioButton& operator=( const RadioButton& origin );
 
-  Image mUnselectedImage;  ///< Stores the unselected image
-  Image mSelectedImage;    ///< Stores the selected image
-  ImageActor mRadioIcon;   ///< Stores the current image
+private:
+
+  Toolkit::TableView mLayoutContainer;      ///< Container to position button images and labels
+
 };
 
 } // namespace Internal