From: taeyoon0.lee Date: Wed, 11 Oct 2017 09:09:23 +0000 (+0900) Subject: Revert "[4.0] Restore behavior of Uploaded and LoadingFinished signal" X-Git-Tag: accepted/tizen/4.0/unified/20171012.230025~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8af08369ee34d382e735ee71496dd8d7423f2a9a;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git Revert "[4.0] Restore behavior of Uploaded and LoadingFinished signal" This reverts commit 1eb285aca1d75034a578c900ffe414ed279976b8. Change-Id: I441d523866fc9870648552f7891aa4509c8592fc --- 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 695eb89..72faf14 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -174,22 +174,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 f0418a1..f335ce7 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.h +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.h @@ -128,11 +128,6 @@ private: // From Control void OnInitialize(); /** - * @copydoc CustomActorImpl::OnStageConnection() - */ - virtual void OnStageConnection( int depth ); - - /** * @copydoc Toolkit::Control::GetNaturalSize */ virtual Vector3 GetNaturalSize();