Move more public-api headers to devel-api. PART 3

[platform/core/uifw/dali-demo.git] / examples / page-turn-view / page-turn-view-example.cpp

diff --git a/examples/page-turn-view/page-turn-view-example.cpp b/examples/page-turn-view/page-turn-view-example.cpp
index 33498cd..4d2d7d7 100644 (file)
--- a/examples/page-turn-view/page-turn-view-example.cpp
+++ b/examples/page-turn-view/page-turn-view-example.cpp
@@ -17,6 +17,12 @@
 
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/shader-effects/page-turn-effect.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-factory.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h>
+
 #include <assert.h>
 #include <cstdlib>
 #include <string.h>
@@ -91,8 +97,6 @@ class PortraitPageFactory : public PageFactory
       page = ImageActor::New( ResourceImage::New( PAGE_IMAGES_PORTRAIT[ (pageId-1) % NUMBER_OF_PORTRAIT_IMAGE ] ) );
     }
 
-    page.SetRelayoutEnabled( false );
-
     return page;
   }
 };
@@ -129,9 +133,6 @@ class LandscapePageFactory : public PageFactory
     }
     pageFront.Add(pageBack);
 
-    pageFront.SetRelayoutEnabled( false );
-    pageBack.SetRelayoutEnabled( false );
-
     return pageFront;
   }
 };
@@ -157,11 +158,9 @@ private:
 
   /**
    * This method gets called when the screen is rotated, switch between portrait and landscape views
-   * param [in] view The view receiving the orientation change signal
-   * param [in] animation The Orientation Rotating animation
    * param [in] orientation The current screen orientation
    */
-  void OnOrientationAnimationStarted( View view, Animation& animation, const Orientation& orientation );
+  void OnOrientationAnimationStarted( Orientation orientation );
 
   /**
    * Main key event handler
@@ -201,7 +200,7 @@ private:
 private:
 
   Application&                mApplication;
-  View                        mView;
+  Actor                       mView;
 
   PageTurnView                mPageTurnPortraitView;
   PageTurnView                mPageTurnLandscapeView;
@@ -236,8 +235,10 @@ void PageTurnController::OnInit( Application& app )
   Vector2 stageSize =  stage.GetSize();
 
   // Create default View.
-  mView = View::New();
-  mView.SetRelayoutEnabled( false );
+  mView = Actor::New();
+  mView.SetAnchorPoint( Dali::AnchorPoint::CENTER );
+  mView.SetParentOrigin( Dali::ParentOrigin::CENTER );
+  mView.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
   stage.Add( mView );
 
   Dali::Window winHandle = app.GetWindow();
@@ -245,13 +246,11 @@ void PageTurnController::OnInit( Application& app )
   winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE );
   winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE  );
   winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
-  // FIXME
-  //app.GetOrientation().ChangedSignal().Connect( &mView, &View::OrientationChanged );
+
   // view will response to orientation change to display portrait or landscape views
-  mView.OrientationAnimationStartedSignal().Connect( this, &PageTurnController::OnOrientationAnimationStarted );
+  app.GetWindow().GetOrientation().ChangedSignal().Connect( this, &PageTurnController::OnOrientationAnimationStarted );
 
   mPageTurnPortraitView = PageTurnPortraitView::New( mPortraitPageFactory, stageSize );
-  mPageTurnPortraitView.SetRelayoutEnabled( false );
   mPageTurnPortraitView.SetSpineShadowParameter( Vector2(70.f, 30.f) );
   mPageTurnPortraitView.PageTurnStartedSignal().Connect( this, &PageTurnController::OnPageStartedTurn );
   mPageTurnPortraitView.PageTurnFinishedSignal().Connect( this, &PageTurnController::OnPageFinishedTurn );
@@ -260,7 +259,6 @@ void PageTurnController::OnInit( Application& app )
   mPageTurnPortraitView.SetPositionInheritanceMode( USE_PARENT_POSITION );
 
   mPageTurnLandscapeView = PageTurnLandscapeView::New( mLandscapePageFactory, Vector2(stageSize.y*0.5f, stageSize.x) );
-  mPageTurnLandscapeView.SetRelayoutEnabled( false );
   mPageTurnLandscapeView.PageTurnStartedSignal().Connect( this, &PageTurnController::OnPageStartedTurn );
   mPageTurnLandscapeView.PageTurnFinishedSignal().Connect( this, &PageTurnController::OnPageFinishedTurn );
   mPageTurnLandscapeView.PagePanStartedSignal().Connect( this, &PageTurnController::OnPageStartedPan );
@@ -270,7 +268,7 @@ void PageTurnController::OnInit( Application& app )
   mView.Add(mPageTurnPortraitView);
 }
 
-void PageTurnController::OnOrientationAnimationStarted( View view, Animation& animation, const Orientation& orientation )
+void PageTurnController::OnOrientationAnimationStarted( Orientation orientation )
 {
   switch( orientation.GetDegrees() )
   {