From: Heeyong Song <heeyong.song@samsung.com>
Date: Tue, 14 Nov 2017 01:15:35 +0000 (+0900)
Subject: [Tizen] Restore behavior of Uploaded and LoadingFinished signal
X-Git-Tag: accepted/tizen/unified/20171117.124946^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=1c3955952e28c8eff3060a2e889613eb64397475;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

[Tizen] Restore behavior of Uploaded and LoadingFinished signal

Change-Id: Ib2d4bec1ebfc3c0e89abd65da85e5753b83a09ec
---

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 835bb4e..14aa73f 100644
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -207,6 +207,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 32867bf..75d5c49 100644
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.h
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.h
@@ -128,6 +128,11 @@ private: // From Control
   void OnInitialize();
 
   /**
+   * @copydoc CustomActorImpl::OnStageConnection()
+   */
+  virtual void OnStageConnection( int depth );
+
+  /**
    * @copydoc Toolkit::Control::GetNaturalSize
    */
   virtual Vector3 GetNaturalSize();