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
/
public-api
/
controls
/
buttons
/
check-box-button.cpp
diff --git
a/dali-toolkit/public-api/controls/buttons/check-box-button.cpp
b/dali-toolkit/public-api/controls/buttons/check-box-button.cpp
index
b288451
..
179304d
100644
(file)
--- a/
dali-toolkit/public-api/controls/buttons/check-box-button.cpp
+++ b/
dali-toolkit/public-api/controls/buttons/check-box-button.cpp
@@
-22,6
+22,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/internal/controls/buttons/check-box-button-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/controls/buttons/check-box-button-impl.h>
+#include <dali/public-api/actors/image-actor.h>
namespace Dali
{
namespace Dali
{
@@
-64,7
+65,7
@@
CheckBoxButton CheckBoxButton::DownCast( BaseHandle handle )
void CheckBoxButton::SetBackgroundImage( Image image )
{
void CheckBoxButton::SetBackgroundImage( Image image )
{
- Dali::Toolkit::GetImplementation( *this ).SetBackgroundImage(
image
);
+ Dali::Toolkit::GetImplementation( *this ).SetBackgroundImage(
ImageActor::New( image )
);
}
void CheckBoxButton::SetBackgroundImage( Actor image )
}
void CheckBoxButton::SetBackgroundImage( Actor image )
@@
-79,7
+80,7
@@
Actor CheckBoxButton::GetBackgroundImage() const
void CheckBoxButton::SetSelectedImage( Image image )
{
void CheckBoxButton::SetSelectedImage( Image image )
{
- Dali::Toolkit::GetImplementation( *this ).SetSelectedImage(
image
);
+ Dali::Toolkit::GetImplementation( *this ).SetSelectedImage(
ImageActor::New( image )
);
}
void CheckBoxButton::SetSelectedImage( Actor image )
}
void CheckBoxButton::SetSelectedImage( Actor image )
@@
-87,7
+88,6
@@
void CheckBoxButton::SetSelectedImage( Actor image )
Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( image );
}
Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( image );
}
-
Actor CheckBoxButton::GetSelectedImage() const
{
return Dali::Toolkit::GetImplementation( *this ).GetSelectedImage();
Actor CheckBoxButton::GetSelectedImage() const
{
return Dali::Toolkit::GetImplementation( *this ).GetSelectedImage();
@@
-95,7
+95,7
@@
Actor CheckBoxButton::GetSelectedImage() const
void CheckBoxButton::SetDisabledBackgroundImage( Image image )
{
void CheckBoxButton::SetDisabledBackgroundImage( Image image )
{
- Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage(
image
);
+ Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage(
ImageActor::New( image )
);
}
void CheckBoxButton::SetDisabledBackgroundImage( Actor image )
}
void CheckBoxButton::SetDisabledBackgroundImage( Actor image )
@@
-110,7
+110,7
@@
Actor CheckBoxButton::GetDisabledBackgroundImage() const
void CheckBoxButton::SetDisabledSelectedImage( Image image )
{
void CheckBoxButton::SetDisabledSelectedImage( Image image )
{
- Dali::Toolkit::GetImplementation( *this ).SetDisabledSelectedImage(
image
);
+ Dali::Toolkit::GetImplementation( *this ).SetDisabledSelectedImage(
ImageActor::New( image )
);
}
void CheckBoxButton::SetDisabledSelectedImage( Actor image )
}
void CheckBoxButton::SetDisabledSelectedImage( Actor image )