From: Joogab Yun Date: Mon, 12 Aug 2019 04:45:02 +0000 (+0900) Subject: [Tizen] Restore behavior of Uploaded and LoadingFinished signal X-Git-Tag: submit/tizen/20190812.050445~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4d646687defed65c3428bd749a0b65602232150d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git [Tizen] Restore behavior of Uploaded and LoadingFinished signal This reverts commit b830c2816086757d99ab862713bc57eed1e7fa42. Change-Id: I5635b988836c2afb5155a0274f506e2d7bb0d1ad --- 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 035d1d8..5a0aa91 100755 --- 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 fe1bac1..a5a114f 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();