Make radio buttons work with size negotiation, bug fixes.

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

diff --git a/base/dali-toolkit/internal/controls/buttons/radio-button-impl.h b/base/dali-toolkit/internal/controls/buttons/radio-button-impl.h
index 1ee813f..5afa145 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/radio-button-impl.h
+++ b/base/dali-toolkit/internal/controls/buttons/radio-button-impl.h
@@ -102,6 +102,11 @@ class RadioButton: public Button
    */
   void ToggleState();
 
    */
   void ToggleState();
 

+  /**
+   * @copydoc Dali::Toolkit::Control::OnRelaidOut(Vector2 size, ActorSizeContainer& container)
+   */
+  virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+

  public:
   // Properties
 
  public:
   // Properties
 


@@ -138,7 +143,7 @@ class RadioButton: public Button
 
   Image mInactiveImage;     ///< Stores the inactive image
   Image mActiveImage;       ///< Stores the active image
 
   Image mInactiveImage;     ///< Stores the inactive image
   Image mActiveImage;       ///< Stores the active image

-  ImageActor mImageActor;   ///< Stores the current image
+  ImageActor mRadioIcon;   ///< Stores the current image

   Actor mLabel;             ///< Stores the button label
   bool mActive;             ///< Stores the active state
 } ;
   Actor mLabel;             ///< Stores the button label
   bool mActive;             ///< Stores the active state
 } ;


@@ -168,4 +173,4 @@ inline const Toolkit::Internal::RadioButton& GetImplementation(const Toolkit::Ra
 } // namespace Toolkit
 } // namespace Dali
 
 } // namespace Toolkit
 } // namespace Dali
 

-#endif // __DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H__
\ No newline at end of file
+#endif // __DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H__