From: Heeyong Song Date: Thu, 10 May 2018 06:51:49 +0000 (+0900) Subject: Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal" X-Git-Tag: accepted/tizen/unified/20180514.094036~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eda6c678703a3c8f64ef4305fcadedbc75bbbfc3;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal" This reverts commit c6c0b4c09358dee345dedffef58014f36eccd999. Change-Id: I8905f9d7864189506e3aa73d0a091a69ac2cd7e9 --- 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 8bfa80d..9af610b 100755 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -207,22 +207,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 75d5c49..32867bf 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();