(9 patch) Make ImageActor SetImage handle 9 patch images

[Issue#]  N/A

[Problem] SetImage would not load the 9 patch image

[Cause] Only ImageActor New would load the 9 patch image

[Solution] Make SetImage load the 9 patch

Change-Id: I3b8dea9aefd520dedb253671345307fff536f309
Signed-off-by: Ferran Sole <ferran.sole@samsung.com>

diff --git a/dali/internal/event/actors/image-actor-impl.cpp b/dali/internal/event/actors/image-actor-impl.cpp
index 6cec2f2..63d8539 100644 (file)
--- a/dali/internal/event/actors/image-actor-impl.cpp
+++ b/dali/internal/event/actors/image-actor-impl.cpp
@@ -169,16 +169,31 @@ void ImageActor::SetImage( Image* image )
 
   mLoadedConnection.DisconnectAll();
 
-  mImageNext.Set( image, OnStage() );
+  ImagePtr imagePtr( image );
 
-  if ( image == NULL )
+  // Automatically convert nine-patch images to cropped bitmap
+  NinePatchImage* ninePatchImage = NinePatchImage::GetNinePatchImage( image );
+  if( ninePatchImage )
+  {
+    imagePtr = ninePatchImage->CreateCroppedBitmapImage();
+  }
+
+  mImageNext.Set( imagePtr.Get(), OnStage() );
+
+  if( ninePatchImage )
+  {
+    SetStyle( Dali::ImageActor::STYLE_NINE_PATCH );
+    SetNinePatchBorder( ninePatchImage->GetStretchBorders(), true );
+  }
+
+  if ( !imagePtr )
   {
     mImageAttachment->SetImage( NULL );
   }
   else
   {
     // don't disconnect currently shown image until we made sure that the new one is loaded
-    OnImageSet( *image );
+    OnImageSet( *imagePtr.Get() );
   }
 }