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
Button refactoring: rename properties
[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
ea4909d
..
c15c15e
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
@@
-76,7
+75,7
@@
Dali::Toolkit::CheckBoxButton CheckBoxButton::New()
void CheckBoxButton::SetChecked( bool checked )
{
void CheckBoxButton::SetChecked( bool checked )
{
- if( !mDi
mm
ed && ( checked != mChecked ) )
+ if( !mDi
sabl
ed && ( checked != mChecked ) )
{
// Stores the state.
mChecked = checked;
{
// Stores the state.
mChecked = checked;
@@
-86,8
+85,8
@@
void CheckBoxButton::SetChecked( bool checked )
// Notifies the painter the checkbox has been checked.
GetCheckBoxButtonPainter( mPainter )->Checked( handle );
// Notifies the painter the checkbox has been checked.
GetCheckBoxButtonPainter( mPainter )->Checked( handle );
- //
Emit signal.
- m
ClickedSignalV2.Emit( handle
);
+ //
Raise state changed signal
+ m
StateChangedSignal.Emit( handle, mChecked
);
}
}
}
}
@@
-138,46
+137,46
@@
Actor CheckBoxButton::GetCheckedImage() const
return mCheckedImage;
}
return mCheckedImage;
}
-void CheckBoxButton::SetDi
mm
edBackgroundImage( Image image )
+void CheckBoxButton::SetDi
sabl
edBackgroundImage( Image image )
{
{
- SetDi
mm
edBackgroundImage( ImageActor::New( image ) );
+ SetDi
sabl
edBackgroundImage( ImageActor::New( image ) );
}
}
-void CheckBoxButton::SetDi
mm
edBackgroundImage( Actor image )
+void CheckBoxButton::SetDi
sabl
edBackgroundImage( Actor image )
{
Toolkit::CheckBoxButton handle( GetOwner() );
{
Toolkit::CheckBoxButton handle( GetOwner() );
- GetCheckBoxButtonPainter( mPainter )->SetDi
mm
edBackgroundImage( handle, image );
+ GetCheckBoxButtonPainter( mPainter )->SetDi
sabl
edBackgroundImage( handle, image );
}
}
-Actor& CheckBoxButton::GetDi
mm
edBackgroundImage()
+Actor& CheckBoxButton::GetDi
sabl
edBackgroundImage()
{
{
- return mDi
mm
edBackgroundImage;
+ return mDi
sabl
edBackgroundImage;
}
}
-Actor CheckBoxButton::GetDi
mm
edBackgroundImage() const
+Actor CheckBoxButton::GetDi
sabl
edBackgroundImage() const
{
{
- return mDi
mm
edBackgroundImage;
+ return mDi
sabl
edBackgroundImage;
}
}
-void CheckBoxButton::SetDi
mm
edCheckedImage( Image image )
+void CheckBoxButton::SetDi
sabl
edCheckedImage( Image image )
{
{
- SetDi
mm
edCheckedImage( ImageActor::New( image ) );
+ SetDi
sabl
edCheckedImage( ImageActor::New( image ) );
}
}
-void CheckBoxButton::SetDi
mm
edCheckedImage( Actor image )
+void CheckBoxButton::SetDi
sabl
edCheckedImage( Actor image )
{
Toolkit::CheckBoxButton handle( GetOwner() );
{
Toolkit::CheckBoxButton handle( GetOwner() );
- GetCheckBoxButtonPainter( mPainter )->SetDi
mm
edCheckedImage( handle, image );
+ GetCheckBoxButtonPainter( mPainter )->SetDi
sabl
edCheckedImage( handle, image );
}
}
-Actor& CheckBoxButton::GetDi
mm
edCheckedImage()
+Actor& CheckBoxButton::GetDi
sabl
edCheckedImage()
{
{
- return mDi
mm
edCheckedImage;
+ return mDi
sabl
edCheckedImage;
}
}
-Actor CheckBoxButton::GetDi
mm
edCheckedImage() const
+Actor CheckBoxButton::GetDi
sabl
edCheckedImage() const
{
{
- return mDi
mm
edCheckedImage;
+ return mDi
sabl
edCheckedImage;
}
Actor& CheckBoxButton::GetFadeOutBackgroundImage()
}
Actor& CheckBoxButton::GetFadeOutBackgroundImage()
@@
-192,8
+191,6
@@
Actor& CheckBoxButton::GetFadeOutCheckedImage()
void CheckBoxButton::OnButtonInitialize()
{
void CheckBoxButton::OnButtonInitialize()
{
- mUseFadeAnimationProperty = Self().RegisterProperty( Toolkit::CheckBoxButton::USE_FADE_ANIMATION_PROPERTY_NAME, false );
- mUseCheckAnimationProperty = Self().RegisterProperty( Toolkit::CheckBoxButton::USE_CHECK_ANIMATION_PROPERTY_NAME, true );
}
void CheckBoxButton::OnButtonUp()
}
void CheckBoxButton::OnButtonUp()
@@
-218,7
+215,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
+231,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;