(ImageView) Restore erroneously removed APIs & Fix SetImage behaviour

[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 8075764..6408c19 100644 (file)
--- a/dali-toolkit/public-api/controls/image-view/image-view.cpp
+++ b/dali-toolkit/public-api/controls/image-view/image-view.cpp
@@ -16,14 +16,15 @@
  */
 
 // CLASS HEADER
-
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
 
+// EXTERNAL INCLUDES
+#include <dali/public-api/images/resource-image.h>
+#include <dali/public-api/object/property-map.h>
+
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/image-view/image-view-impl.h>
 
-// EXTERNAL INCLUDES
-
 namespace Dali
 {
 
@@ -61,19 +62,26 @@ ImageView ImageView::New( Image image )
 {
   ImageView imageView = Internal::ImageView::New();
   imageView.SetImage( image );
-  return imageView;
+  return ImageView( imageView );
 }
 
 ImageView ImageView::New( const std::string& url )
 {
   ImageView imageView = Internal::ImageView::New();
-  imageView.SetProperty( ImageView::Property::RESOURCE_URL, Dali::Property::Value( 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;
 }
 
 ImageView ImageView::DownCast( BaseHandle handle )
 {
-  return Control::DownCast<ImageView, Internal::ImageView>(handle);
+  return Control::DownCast<ImageView, Internal::ImageView>( handle );
 }
 
 void ImageView::SetImage( Image image )
@@ -81,9 +89,19 @@ void ImageView::SetImage( Image image )
   Dali::Toolkit::GetImpl( *this ).SetImage( image );
 }
 
+void ImageView::SetImage( const std::string& 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
 {
-  return Dali::Toolkit::GetImpl( *this ).GetImage();
+  return Image();
 }
 
 ImageView::ImageView( Internal::ImageView& implementation )