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
Cleaning up property public API and usage of typedefs
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
internal
/
controls
/
buttons
/
check-box-button-impl.cpp
diff --git
a/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
b/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
index
e252ea5
..
85fe1a6
100644
(file)
--- a/
base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
+++ b/
base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
@@
-16,15
+16,14
@@
*/
// CLASS HEADER
*/
// CLASS HEADER
-
#include "check-box-button-impl.h"
// EXTERNAL INCLUDES
#include "check-box-button-impl.h"
// EXTERNAL INCLUDES
-
#include <algorithm>
#include <algorithm>
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/object/type-registry.h>
// INTERNAL INCLUDES
// INTERNAL INCLUDES
-
#include "check-box-button-default-painter-impl.h"
namespace Dali
#include "check-box-button-default-painter-impl.h"
namespace Dali
@@
-218,7
+217,7
@@
float CheckBoxButton::OnAnimationTimeRequested() const
void CheckBoxButton::OnActivated()
{
// When the button is activated, it performs the click action
void CheckBoxButton::OnActivated()
{
// When the button is activated, it performs the click action
-
std::vector<Property::Value>
attributes;
+
PropertyValueContainer
attributes;
DoClickAction(attributes);
}
DoClickAction(attributes);
}
@@
-234,7
+233,7
@@
void CheckBoxButton::DoClickAction(const PropertyValueContainer& attributes)
}
}
}
}
-bool CheckBoxButton::DoAction(BaseObject* object, const std::string& actionName, const
std::vector<Property::Value>
& attributes)
+bool CheckBoxButton::DoAction(BaseObject* object, const std::string& actionName, const
PropertyValueContainer
& attributes)
{
bool ret = false;
{
bool ret = false;
@@
-254,7
+253,9
@@
bool CheckBoxButton::DoAction(BaseObject* object, const std::string& actionName,
CheckBoxButton::CheckBoxButton()
: Button(),
mChecked( false ),
CheckBoxButton::CheckBoxButton()
: Button(),
mChecked( false ),
- mClickActionPerforming(false)
+ mClickActionPerforming(false),
+ mUseFadeAnimationProperty(Property::INVALID_INDEX),
+ mUseCheckAnimationProperty(Property::INVALID_INDEX)
{
// Creates specific painter.
mPainter = new CheckBoxButtonDefaultPainter();
{
// Creates specific painter.
mPainter = new CheckBoxButtonDefaultPainter();