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
Fix for divide by zero in FixedRuler::GetPageFromPosition()
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
public-api
/
controls
/
default-controls
/
push-button-factory.cpp
diff --git
a/base/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp
b/base/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp
index
f972a1a
..
a2818e8
100644
(file)
--- a/
base/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp
+++ b/
base/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp
@@
-15,12
+15,14
@@
*
*/
*
*/
-#include <dali-toolkit/public-api/controls/alignment/alignment.h>
+// HEADER
#include <dali-toolkit/public-api/controls/default-controls/push-button-factory.h>
// EXTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/default-controls/push-button-factory.h>
// EXTERNAL INCLUDES
-// INTERNAL INCLUDES
+#include <dali/public-api/actors/image-actor.h>
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/alignment/alignment.h>
namespace Dali
{
namespace Dali
{
@@
-44,7
+46,6
@@
Alignment CreateAlignedImage( Actor image )
Alignment CreateAlignedImage( const std::string& imagePath )
{
Image image = Image::New( imagePath );
Alignment CreateAlignedImage( const std::string& imagePath )
{
Image image = Image::New( imagePath );
-
return CreateAlignedImage( ImageActor::New( image ) );
}
return CreateAlignedImage( ImageActor::New( image ) );
}