From b7f80019a89a0fee0ff5235cacf7d5ab98d26521 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Mon, 3 Dec 2018 14:55:40 +0900 Subject: [PATCH] Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal" This reverts commit d27db86dac712a1b06f7430e84855a2569a29b17. Change-Id: I7674b67980dcf90372aedf2bacb1db608d14415f --- .../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 859ef08..890312c 100755 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -233,22 +233,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 8b44b5f..4f05648 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(); -- 2.7.4