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
Moved PushButton::SetButtonImage etc to Button base class.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
buttons
/
push-button.cpp
diff --git
a/dali-toolkit/public-api/controls/buttons/push-button.cpp
b/dali-toolkit/public-api/controls/buttons/push-button.cpp
index
d2ae939
..
d3f21d7
100644
(file)
--- a/
dali-toolkit/public-api/controls/buttons/push-button.cpp
+++ b/
dali-toolkit/public-api/controls/buttons/push-button.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
5
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.
@@
-74,11
+74,6
@@
PushButton PushButton::DownCast( BaseHandle handle )
return Control::DownCast<PushButton, Internal::PushButton>(handle);
}
return Control::DownCast<PushButton, Internal::PushButton>(handle);
}
-void PushButton::SetButtonImage( Image image )
-{
- Dali::Toolkit::GetImplementation( *this ).SetButtonImage( ImageActor::New( image ) );
-}
-
void PushButton::SetButtonImage( Actor image )
{
Dali::Toolkit::GetImplementation( *this ).SetButtonImage( image );
void PushButton::SetButtonImage( Actor image )
{
Dali::Toolkit::GetImplementation( *this ).SetButtonImage( image );
@@
-89,11
+84,6
@@
Actor PushButton::GetButtonImage() const
return Dali::Toolkit::GetImplementation( *this ).GetButtonImage();
}
return Dali::Toolkit::GetImplementation( *this ).GetButtonImage();
}
-void PushButton::SetBackgroundImage( Image image )
-{
- Dali::Toolkit::GetImplementation( *this ).SetBackgroundImage( ImageActor::New( image ) );
-}
-
void PushButton::SetBackgroundImage( Actor image )
{
Dali::Toolkit::GetImplementation( *this ).SetBackgroundImage( image );
void PushButton::SetBackgroundImage( Actor image )
{
Dali::Toolkit::GetImplementation( *this ).SetBackgroundImage( image );
@@
-104,11
+94,6
@@
Actor PushButton::GetBackgroundImage() const
return Dali::Toolkit::GetImplementation( *this ).GetBackgroundImage();
}
return Dali::Toolkit::GetImplementation( *this ).GetBackgroundImage();
}
-void PushButton::SetSelectedImage( Image image )
-{
- Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( ImageActor::New( image ) );
-}
-
void PushButton::SetSelectedImage( Actor image )
{
Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( image );
void PushButton::SetSelectedImage( Actor image )
{
Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( image );
@@
-119,9
+104,14
@@
Actor PushButton::GetSelectedImage() const
return Dali::Toolkit::GetImplementation( *this ).GetSelectedImage();
}
return Dali::Toolkit::GetImplementation( *this ).GetSelectedImage();
}
-void PushButton::SetDisabledBackgroundImage( Image image )
+void PushButton::SetSelectedBackgroundImage( Actor image )
+{
+ Dali::Toolkit::GetImplementation( *this ).SetSelectedBackgroundImage( image );
+}
+
+Actor PushButton::GetSelectedBackgroundImage() const
{
{
-
Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage( ImageActor::New( image )
);
+
return Dali::Toolkit::GetImplementation( *this ).GetSelectedBackgroundImage(
);
}
void PushButton::SetDisabledBackgroundImage( Actor image )
}
void PushButton::SetDisabledBackgroundImage( Actor image )
@@
-134,11
+124,6
@@
Actor PushButton::GetDisabledBackgroundImage() const
return Dali::Toolkit::GetImplementation( *this ).GetDisabledBackgroundImage();
}
return Dali::Toolkit::GetImplementation( *this ).GetDisabledBackgroundImage();
}
-void PushButton::SetDisabledImage( Image image )
-{
- Dali::Toolkit::GetImplementation( *this ).SetDisabledImage( ImageActor::New( image ) );
-}
-
void PushButton::SetDisabledImage( Actor image )
{
Dali::Toolkit::GetImplementation( *this ).SetDisabledImage( image );
void PushButton::SetDisabledImage( Actor image )
{
Dali::Toolkit::GetImplementation( *this ).SetDisabledImage( image );