From 6275c8953b7908321d408a470b78c07383614b45 Mon Sep 17 00:00:00 2001 From: Kimmo Hoikka Date: Wed, 3 Jun 2015 17:21:08 +0100 Subject: [PATCH 1/1] remove dead code from shadow view (OnStageConnection & OnStageDisconnection) Change-Id: I53890c76dd89066be631898a1e5142c7b86d212a --- .../internal/controls/shadow-view/shadow-view-impl.cpp | 14 -------------- .../internal/controls/shadow-view/shadow-view-impl.h | 2 -- 2 files changed, 16 deletions(-) diff --git a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp index e445a65..f2fe0b9 100644 --- a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp +++ b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp @@ -281,20 +281,6 @@ void ShadowView::OnSizeSet(const Vector3& targetSize) { } -void ShadowView::OnStageConnection() -{ - // TODO: can't call this here, since SetImage() calls fail to connect images to stage, since parent chain not fully on stage yet - // Need to fix the stage connection so this callback can be used arbitrarily. At that point we can simplify the API by removing the need for Activate() / Deactivate() - //Activate(); -} - -void ShadowView::OnStageDisconnection() -{ - // TODO: can't call this here, since SetImage() calls fails similarly to above - // Need to fix the stage connection so this callback can be used arbitrarily. At that point we can simplify the API by removing the need for Activate() / Deactivate() - //Deactivate(); -} - void ShadowView::ConstrainCamera() { if( mPointLight && mShadowPlane ) diff --git a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h index cbac96e..5aa3595 100644 --- a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h +++ b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h @@ -125,8 +125,6 @@ private: virtual void OnInitialize(); virtual void OnSizeSet(const Vector3& targetSize); - virtual void OnStageConnection(); - virtual void OnStageDisconnection(); /** * Constrain the camera actor to the position of the point light, pointing -- 2.7.4