Merge "Changed ShadowView to use new custom effects and ImageView." into devel/master

diff --combined dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
index 7210e9e,3060bf9..14e8405
--- 1/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
--- 2/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
+++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
@@@ -28,7 -28,6 +28,6 @@@
  #include <dali/public-api/render-tasks/render-task-list.h>
  
  // INTERNAL INCLUDES
- #include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
  #include <dali-toolkit/internal/controls/page-turn-view/page-turn-effect.h>
  #include <dali-toolkit/internal/controls/page-turn-view/page-turn-book-spine-effect.h>
  
@@@ -340,11 -339,11 +339,11 @@@ void PageTurnView::SetupShadowView(
    mShadowView.SetPointLightFieldOfView( Math::PI / 2.0f);
    mShadowView.SetShadowColor(DEFAULT_SHADOW_COLOR);
  
-   mShadowPlane = CreateSolidColorActor( Vector4 (0.0f, 0.0f, 0.0f, 0.0f) );
-   mShadowPlane.SetPositionInheritanceMode( USE_PARENT_POSITION_PLUS_LOCAL_POSITION );
-   mShadowPlane.SetSize( mControlSize );
-   Self().Add( mShadowPlane );
-   mShadowView.SetShadowPlane( mShadowPlane );
+   mShadowPlaneBackground = Actor::New();
+   mShadowPlaneBackground.SetPositionInheritanceMode( USE_PARENT_POSITION_PLUS_LOCAL_POSITION );
+   mShadowPlaneBackground.SetSize( mControlSize );
+   Self().Add( mShadowPlaneBackground );
+   mShadowView.SetShadowPlaneBackground( mShadowPlaneBackground );
  
    mPointLight = Actor::New();
    mPointLight.SetAnchorPoint( origin );
@@@ -359,8 -358,6 +358,8 @@@
  
  void PageTurnView::OnStageConnection( int depth )
  {
 +  Control::OnStageConnection( depth );
 +
    SetupShadowView();
    mTurningPageLayer.Raise();
  }
@@@ -370,7 -367,7 +369,7 @@@ void PageTurnView::OnStageDisconnection
    if(mShadowView)
    {
      mPointLight.Unparent();
-     mShadowPlane.Unparent();
+     mShadowPlaneBackground.Unparent();
      mShadowView.Unparent();
    }
  
@@@ -387,8 -384,6 +386,8 @@@
  
      SetSpineEffect( mPanActor, mIsTurnBack[mPanActor] );
    }
 +
 +  Control::OnStageDisconnection();
  }
  
  void PageTurnView::SetPageSize( const Vector2& pageSize )
@@@ -420,9 -415,9 +419,9 @@@
  
    OnPageTurnViewInitialize();
  
-   if( mShadowPlane )
+   if( mShadowPlaneBackground )
    {
-     mShadowPlane.SetSize( mControlSize );
+     mShadowPlaneBackground.SetSize( mControlSize );
    }
  }