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 branch 'tizen' into devel/new_mesh
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
buttons
/
button-impl.cpp
diff --git
a/dali-toolkit/internal/controls/buttons/button-impl.cpp
b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index
1c31fe5
..
c0d52ca
100644
(file)
--- a/
dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/
dali-toolkit/internal/controls/buttons/button-impl.cpp
@@
-905,7
+905,7
@@
Actor& Button::GetDisabledBackgroundImage()
return mDisabledBackgroundContent;
}
return mDisabledBackgroundContent;
}
-
bool Button::DoAction( BaseObject* object, const std::string& actionName, const PropertyValueContainer
& attributes )
+
bool Button::DoAction( BaseObject* object, const std::string& actionName, const Property::Map
& attributes )
{
bool ret = false;
{
bool ret = false;
@@
-924,7
+924,7
@@
bool Button::DoAction( BaseObject* object, const std::string& actionName, const
return ret;
}
return ret;
}
-
void Button::DoClickAction( const PropertyValueContainer
& attributes )
+
void Button::DoClickAction( const Property::Map
& attributes )
{
// Prevents the button signals from doing a recursive loop by sending an action
// and re-emitting the signals.
{
// Prevents the button signals from doing a recursive loop by sending an action
// and re-emitting the signals.
@@
-1210,7
+1210,7
@@
void Button::OnInitialize()
void Button::OnActivated()
{
// When the button is activated, it performs the click action
void Button::OnActivated()
{
// When the button is activated, it performs the click action
- Property
ValueContainer
attributes;
+ Property
::Map
attributes;
DoClickAction( attributes );
}
DoClickAction( attributes );
}