*/
// CLASS HEADER
-
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+#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
{
ImageView ImageView::New( Image image )
{
+ DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: New() is deprecated and will be removed from next release. use New( const std::string& ) instead.\n" );
+
ImageView imageView = Internal::ImageView::New();
imageView.SetImage( image );
return 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 )
{
+ DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetImage() is deprecated and will be removed from next release. Use SetImage( const std::string& ) instead.\n" );
+
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
{
+ DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: GetImage() is deprecated and will be removed from next release.\n" );
+
return Dali::Toolkit::GetImpl( *this ).GetImage();
}