From b6687a35f727a2224b25fb21677cb694e864e107 Mon Sep 17 00:00:00 2001 From: Jiyun Yang Date: Wed, 22 Apr 2020 15:14:42 +0900 Subject: [PATCH] Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal" This reverts commit dd198f7916a2ce6929fd9e84e34199a6729aab86. --- .../controls/image-view/image-view-impl.cpp | 16 ---------------- .../controls/image-view/image-view-impl.h | 5 ----- 2 files changed, 21 deletions(-) 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 5a0aa9192b..035d1d841b 100755 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -234,22 +234,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 a5a114f2e6..fe1bac10a7 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.h +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.h @@ -127,11 +127,6 @@ private: // From Control */ void OnInitialize(); - /** - * @copydoc CustomActorImpl::OnStageConnection() - */ - virtual void OnStageConnection( int depth ); - /** * @copydoc Toolkit::Control::GetNaturalSize */ -- 2.34.1