From 155449f47de8b6e0a4c4edae2cab7ae16d5fd274 Mon Sep 17 00:00:00 2001 From: "Jinho, Lee" Date: Tue, 4 Jul 2017 14:54:47 +0900 Subject: [PATCH] Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal" This reverts commit d2bce9840862469d6ddfdaec4c94b46eaee14772. Change-Id: Ic0808e8c920f25df6ecce153336ade390982b4f8 --- .../internal/controls/image-view/image-view-impl.cpp | 16 ---------------- .../internal/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 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(); -- 2.7.4