projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactoring Button: remove painter
[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
..
db28905
100644
(file)
--- a/
dali-toolkit/internal/controls/buttons/radio-button-impl.h
+++ b/
dali-toolkit/internal/controls/buttons/radio-button-impl.h
@@
-41,7
+41,7
@@
namespace Internal
*/
class RadioButton: public Button
{
*/
class RadioButton: public Button
{
-
public:
+public:
/**
* Create a new RadioButton.
/**
* Create a new RadioButton.
@@
-70,45
+70,54
@@
class RadioButton: public Button
*/
virtual ~RadioButton();
*/
virtual ~RadioButton();
+public: // From Button
+
/**
/**
- * @copydoc
Dali::Toolkit::Button::SetLabel( Actor label
)
+ * @copydoc
Toolkit::Internal::Button::SetButtonImage( Actor image
)
*/
*/
- virtual void Set
Label( Actor label ); // TODO: After refactoring painter, this will be removed
+ virtual void Set
ButtonImage( 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 On
Relayout( const Vector2& size, ActorSizeContainer& container
);
+ virtual void On
ButtonInitialize(
);
- 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 On
Initialize(
);
+ virtual void On
Selected( bool selected
);
- protected: // From Button
/**
/**
- *
Change button state when the button is pressed.
+ *
@copydoc Toolkit::Internal::Button::OnLabelSet()
*/
*/
- virtual void On
ButtonUp
();
+ virtual void On
LabelSet
();
- private:
+private: // From Control
+
+ /**
+ * @copydoc Dali::Toolkit::Control::OnRelayout()
+ */
+ virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
+
+private:
// Undefined
RadioButton( const RadioButton& origin );
// Undefined
RadioButton& operator=( const RadioButton& origin );
// Undefined
RadioButton( const RadioButton& origin );
// Undefined
RadioButton& operator=( const RadioButton& origin );
-
- Image mUnselectedImage; ///< Stores the unselected image
- Image mSelectedImage; ///< Stores the selected image
- ImageActor mRadioIcon; ///< Stores the current image
};
} // namespace Internal
};
} // namespace Internal