[Tizen] Restore behavior of Uploaded and LoadingFinished signal

This reverts commit 76cc1b6284c23b46bed9c534503c547e4427b3d4.

Change-Id: I85ad14d57833e2c4dc30ac31fe44ac6939c7e2c4

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 035d1d841bca0bd59c4dc484a7ffc4d69b66512a..5a0aa9192b91e27a107e03f46dbac4a09460633c 100755 (executable)
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -234,6 +234,22 @@ void ImageView::SetDepthIndex( int depthIndex )
   }
 }
 
+void ImageView::OnStageConnection( int depth )
+{
+  if( mImage )
+  {
+    mImage.UploadedSignal().Emit( mImage );
+  }
+
+  Dali::ResourceImage resourceImage = Dali::ResourceImage::DownCast( mImage );
+  if( resourceImage )
+  {
+    resourceImage.LoadingFinishedSignal().Emit( resourceImage );
+  }
+
+  Control::OnStageConnection( depth ); // Enabled visuals will be put on stage
+}
+
 Vector3 ImageView::GetNaturalSize()
 {
   if( mVisual )

diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.h b/dali-toolkit/internal/controls/image-view/image-view-impl.h
index fe1bac10a7a47415b9e0cf7ddd81a2c9fe10280e..a5a114f2e6115c922d113150323de3fe6f6b7a1e 100644 (file)
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.h
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.h
@@ -127,6 +127,11 @@ private: // From Control
    */
   void OnInitialize();
 
+  /**
+   * @copydoc CustomActorImpl::OnStageConnection()
+   */
+  virtual void OnStageConnection( int depth );
+
   /**
    * @copydoc Toolkit::Control::GetNaturalSize
    */