From 43510983625f3fcf5bd98300a19e7868b962453f Mon Sep 17 00:00:00 2001 From: Wonsik Jung Date: Thu, 19 Dec 2019 15:21:15 +0900 Subject: [PATCH] [Tizen] Restore behavior of Uploaded and LoadingFinished signal This reverts commit 7c3c02f3a309db4585750431bb51ad33014725b5. --- .../controls/image-view/image-view-impl.cpp | 16 ++++++++++++++++ .../controls/image-view/image-view-impl.h | 5 +++++ 2 files changed, 21 insertions(+) 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 035d1d841b..5a0aa9192b 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 fe1bac10a7..a5a114f2e6 100644 --- 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 */ -- 2.34.1