From: minho.sun Date: Wed, 7 Jun 2017 03:08:14 +0000 (+0900) Subject: Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal" X-Git-Tag: accepted/tizen/unified/20170608.072242~8 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=9f6fa68b4e96e4a4e90d36a9b530f281aa2b39df Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal" This reverts commit f3e7e9a264faa49607758b5221c05dac72f7d231. Change-Id: I1039fb5be3c1835b41b522e2a73803651b9a0ba7 --- 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 b729f96..65e043e 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -156,22 +156,6 @@ 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 22b91bf..ac76e78 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.h +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.h @@ -123,11 +123,6 @@ public: private: // From Control /** - * @copydoc CustomActorImpl::OnStageConnection() - */ - virtual void OnStageConnection( int depth ); - - /** * @copydoc Toolkit::Control::GetNaturalSize */ virtual Vector3 GetNaturalSize();