From 8025e4d0a73ed7cbdcc9be8a4423e840afa51a02 Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Mon, 9 Jul 2018 14:08:21 +0900 Subject: [PATCH] [Tizen] Restore behavior of Uploaded and LoadingFinished signal This reverts commit 94035c7eb51a27e2791f009829a7fde17ec260e8. Change-Id: I0728c1a55c012ac2b9b48d51f3465fbfc503e85b --- .../internal/controls/image-view/image-view-impl.cpp | 16 ++++++++++++++++ .../internal/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 11d5389..1e73c9c 100755 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -213,6 +213,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(); -- 2.7.4