[4.0] Restore behavior of Uploaded and LoadingFinished signal 26/155726/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 16 Oct 2017 04:55:45 +0000 (13:55 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 16 Oct 2017 04:55:55 +0000 (13:55 +0900)
This reverts commit ddc8c65eb5c1d5ea3a22d48582f6fd0fed306bf2.

Change-Id: Ib9e407bb7d2645fc240113de7618e19e579aad6c

dali-toolkit/internal/controls/image-view/image-view-impl.cpp
dali-toolkit/internal/controls/image-view/image-view-impl.h

index e7514b0..a3f5184 100644 (file)
@@ -174,6 +174,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 )
index f335ce7..f0418a1 100644 (file)
@@ -128,6 +128,11 @@ private: // From Control
   void OnInitialize();
 
   /**
+   * @copydoc CustomActorImpl::OnStageConnection()
+   */
+  virtual void OnStageConnection( int depth );
+
+  /**
    * @copydoc Toolkit::Control::GetNaturalSize
    */
   virtual Vector3 GetNaturalSize();