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 "Add GetEglImageTextureTarget() in TestNativeImageExtension" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
image-view
/
image-view.cpp
diff --git
a/dali-toolkit/public-api/controls/image-view/image-view.cpp
b/dali-toolkit/public-api/controls/image-view/image-view.cpp
index
e3d2b67
..
2726af5
100644
(file)
--- a/
dali-toolkit/public-api/controls/image-view/image-view.cpp
+++ b/
dali-toolkit/public-api/controls/image-view/image-view.cpp
@@
-62,13
+62,20
@@
ImageView ImageView::New( Image image )
{
ImageView imageView = Internal::ImageView::New();
imageView.SetImage( image );
{
ImageView imageView = Internal::ImageView::New();
imageView.SetImage( image );
- return
ImageView( imageView )
;
+ return
imageView
;
}
ImageView ImageView::New( const std::string& url )
{
ImageView imageView = Internal::ImageView::New();
}
ImageView ImageView::New( const std::string& url )
{
ImageView imageView = Internal::ImageView::New();
- imageView.SetImage( url );
+ imageView.SetImage( url, ImageDimensions() );
+ return imageView;
+}
+
+ImageView ImageView::New( const std::string& url, ImageDimensions size )
+{
+ ImageView imageView = Internal::ImageView::New();
+ imageView.SetImage( url, size );
return imageView;
}
return imageView;
}
@@
-84,12
+91,17
@@
void ImageView::SetImage( Image image )
void ImageView::SetImage( const std::string& url )
{
void ImageView::SetImage( const std::string& url )
{
- Dali::Toolkit::GetImpl( *this ).SetImage( url );
+ Dali::Toolkit::GetImpl( *this ).SetImage( url, ImageDimensions() );
+}
+
+void ImageView::SetImage( const std::string& url, ImageDimensions size )
+{
+ Dali::Toolkit::GetImpl( *this ).SetImage( url, size );
}
Image ImageView::GetImage() const
{
}
Image ImageView::GetImage() const
{
- return Image();
+ return
Dali::Toolkit::GetImpl( *this ).Get
Image();
}
ImageView::ImageView( Internal::ImageView& implementation )
}
ImageView::ImageView( Internal::ImageView& implementation )