[Tizen] Restore behavior of Uploaded and LoadingFinished signal

This reverts commit 9ac28d315f66182ec5dfdc211580cb97961546c8.

Change-Id: I9573cebae35e44861e259e22e3cb99b4405685f2

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 28cbfff293eff3b39b370fae5db61a02f5a3c705..45c494953acc2550d134996fae902b595afa5712 100755 (executable)
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -237,6 +237,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 382feb8734f25185e6877c96411bebf1b87fa568..0a8fbd8648af9287db4293daa70b83d2b35f0dd0 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
    */