(ImageView) Restore erroneously removed APIs & Fix SetImage behaviour

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / image-view / image-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
index 6f45e82..e47d1cd 100644 (file)
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -66,7 +66,9 @@ Toolkit::ImageView ImageView::New()
 
 void ImageView::SetImage( Image image )
 {
 
 void ImageView::SetImage( Image image )
 {

-  if( mImage != image )
+  if( ( mImage != image ) ||
+      ! mUrl.empty()      ||   // If we're changing from a URL type to an Image type
+      ! mPropertyMap.Empty() ) // If we're changing from a property map type to an Image type

   {
     mUrl.clear();
     mPropertyMap.Clear();
   {
     mUrl.clear();
     mPropertyMap.Clear();


@@ -76,11 +78,15 @@ void ImageView::SetImage( Image image )
     Actor self = Self();
     Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, image );
     mImageSize = image ? ImageDimensions( image.GetWidth(), image.GetHeight() ) : ImageDimensions( 0, 0 );
     Actor self = Self();
     Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, image );
     mImageSize = image ? ImageDimensions( image.GetWidth(), image.GetHeight() ) : ImageDimensions( 0, 0 );

+
+    RelayoutRequest();

   }
 }
 
 void ImageView::SetImage( Property::Map map )
 {
   }
 }
 
 void ImageView::SetImage( Property::Map map )
 {

+  mUrl.clear();
+  mImage.Reset();

   mPropertyMap = map;
 
   Actor self = Self();
   mPropertyMap = map;
 
   Actor self = Self();


@@ -101,21 +107,34 @@ void ImageView::SetImage( Property::Map map )
   }
 
   mImageSize = ImageDimensions( width, height );
   }
 
   mImageSize = ImageDimensions( width, height );

+
+  RelayoutRequest();

 }
 
 }
 

-void ImageView::SetImage( const std::string& url )
+void ImageView::SetImage( const std::string& url, ImageDimensions size )

 {
 {

-  if( mUrl != url )
+  if( ( mUrl != url ) ||
+      mImage          ||       // If we're changing from an Image type to a URL type
+      ! mPropertyMap.Empty() ) // If we're changing from a property map type to a URL type

   {
     mImage.Reset();
     mPropertyMap.Clear();
 
     mUrl = url;
 
   {
     mImage.Reset();
     mPropertyMap.Clear();
 
     mUrl = url;
 

+    if( size.GetWidth() == 0u && size.GetHeight() == 0u )
+    {
+      mImageSize = ResourceImage::GetImageSize( mUrl );
+    }
+    else
+    {
+      mImageSize = size;
+    }
+

     Actor self = Self();
     Actor self = Self();

-    Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, mUrl );
+    Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, mUrl, mImageSize );

 
 

-    mImageSize = ResourceImage::GetImageSize( mUrl );
+    RelayoutRequest();

   }
 }
 
   }
 }
 


@@ -127,7 +146,7 @@ Vector3 ImageView::GetNaturalSize()
   size.y = mImageSize.GetHeight();
   size.z = std::min(size.x, size.y);
 
   size.y = mImageSize.GetHeight();
   size.z = std::min(size.x, size.y);
 

-  if( size.x > 0 && size.x > 0 )
+  if( size.x > 0 && size.y > 0 )

   {
     return size;
   }
   {
     return size;
   }


@@ -169,6 +188,8 @@ float ImageView::GetWidthForHeight( float height )
 
 void ImageView::OnStageConnection( int depth )
 {
 
 void ImageView::OnStageConnection( int depth )
 {

+  Control::OnStageConnection( depth );
+

   if( mRenderer )
   {
     CustomActor self = Self();
   if( mRenderer )
   {
     CustomActor self = Self();


@@ -183,6 +204,8 @@ void ImageView::OnStageDisconnection()
     CustomActor self = Self();
     mRenderer.SetOffStage( self );
   }
     CustomActor self = Self();
     mRenderer.SetOffStage( self );
   }

+
+  Control::OnStageDisconnection();

 }
 
 
 }
 
 


@@ -205,7 +228,7 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr
         if( value.Get( imageUrl ) )
         {
           ImageView& impl = GetImpl( imageView );
         if( value.Get( imageUrl ) )
         {
           ImageView& impl = GetImpl( imageView );

-          impl.SetImage( imageUrl );
+          impl.SetImage( imageUrl, ImageDimensions() );

         }
 
         // if its not a string then get a Property::Map from the property if possible.
         }
 
         // if its not a string then get a Property::Map from the property if possible.