From: Daekwang Ryu Date: Mon, 23 Jul 2018 05:35:34 +0000 (+0900) Subject: [Tizen] Restore behavior of Uploaded and LoadingFinished signal X-Git-Tag: accepted/tizen/unified/20180724.073304~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b1d55c1e46eac83d66b198dc08f142dfd7a65ae;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git [Tizen] Restore behavior of Uploaded and LoadingFinished signal This reverts commit aef44096fe8871235fba4c8f8ce6b7e33c0fba00. --- 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();