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
Merge "Fixed IsCandidate bug" into devel/master
[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
34130ae
..
b172750
100644
(file)
--- 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) 20
14
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
21
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-22,8
+22,8
@@
#include <dali/public-api/common/dali-vector.h>
// INTERNAL INCLUDES
#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 <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
#include "button-impl.h"
namespace Dali
@@
-32,16
+32,14
@@
namespace Toolkit
{
namespace Internal
{
{
namespace Internal
{
-
/**
* RadioButton implementation class.
*
* \sa Dali::Toolkit::RadioButton
*/
/**
* RadioButton implementation class.
*
* \sa Dali::Toolkit::RadioButton
*/
-class RadioButton: public Button
+class RadioButton
: public Button
{
public:
{
public:
-
/**
* Create a new RadioButton.
*
/**
* Create a new RadioButton.
*
@@
-50,7
+48,6
@@
public:
static Dali::Toolkit::RadioButton New();
private:
static Dali::Toolkit::RadioButton New();
private:
-
/**
* Construct a new RadioButton.
*/
/**
* Construct a new RadioButton.
*/
@@
-62,34
+59,35
@@
private:
virtual ~RadioButton();
private: // From Button
virtual ~RadioButton();
private: // From Button
-
- /**
- * @copydoc Toolkit::Internal::Button::OnButtonInitialize
- */
- virtual void OnButtonInitialize();
-
/**
/**
- * @copydoc Toolkit::Internal::Button::On
ButtonUp
+ * @copydoc Toolkit::Internal::Button::On
Initialize
*/
*/
- v
irtual void OnButtonUp()
;
+ v
oid OnInitialize() override
;
/**
/**
- * @copydoc Toolkit::Internal::Button::OnS
elected
+ * @copydoc Toolkit::Internal::Button::OnS
tateChange
*/
*/
- v
irtual void OnSelected()
;
+ v
oid OnStateChange(State newState) override
;
/**
/**
- * @copydoc Toolkit::Internal::Button::On
LabelSet
+ * @copydoc Toolkit::Internal::Button::On
ToggleReleased
*/
*/
-
virtual void OnLabelSet( bool noPadding )
;
+
bool OnToggleReleased() override
;
private:
private:
-
// Undefined
// Undefined
- RadioButton(
const RadioButton& origin
);
+ RadioButton(
const RadioButton& origin
);
// Undefined
// Undefined
- RadioButton& operator=( const RadioButton& origin );
+ RadioButton& operator=(const RadioButton& origin);
+
+protected:
+ struct AccessibleImpl : public Button::AccessibleImpl
+ {
+ using Button::AccessibleImpl::AccessibleImpl;
+
+ Dali::Accessibility::States CalculateStates() override;
+ };
};
} // namespace Internal
};
} // namespace Internal
@@
-102,7
+100,7
@@
inline Toolkit::Internal::RadioButton& GetImplementation(Toolkit::RadioButton& b
Dali::RefObject& handle = button.GetImplementation();
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)
}
inline const Toolkit::Internal::RadioButton& GetImplementation(const Toolkit::RadioButton& button)
@@
-111,10
+109,10
@@
inline const Toolkit::Internal::RadioButton& GetImplementation(const Toolkit::Ra
const Dali::RefObject& handle = button.GetImplementation();
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
}
} // namespace Toolkit
} // namespace Dali
-#endif //
__DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H__
+#endif //
DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H