Merge remote-tracking branch 'origin/tizen' into new_text

[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 fa412ad..33498cd 100644 (file)
--- a/examples/page-turn-view/page-turn-view-example.cpp
+++ b/examples/page-turn-view/page-turn-view-example.cpp
@@ -22,6 +22,8 @@
 #include <string.h>
 #include <iostream>
 
+#include "shared/view.h"
+
 using namespace Dali;
 using namespace Dali::Toolkit;
 
@@ -78,14 +80,20 @@ class PortraitPageFactory : public PageFactory
    */
   virtual Actor NewPage( unsigned int pageId )
   {
+    ImageActor page;
+
     if( pageId == 0 )
     {
-      return ImageActor::New( ResourceImage::New( BOOK_COVER_PORTRAIT ) );
+      page = ImageActor::New( ResourceImage::New( BOOK_COVER_PORTRAIT ) );
     }
     else
     {
-      return ImageActor::New( ResourceImage::New( PAGE_IMAGES_PORTRAIT[ (pageId-1) % NUMBER_OF_PORTRAIT_IMAGE ] ) );
+      page = ImageActor::New( ResourceImage::New( PAGE_IMAGES_PORTRAIT[ (pageId-1) % NUMBER_OF_PORTRAIT_IMAGE ] ) );
     }
+
+    page.SetRelayoutEnabled( false );
+
+    return page;
   }
 };
 
@@ -120,6 +128,10 @@ class LandscapePageFactory : public PageFactory
       pageBack = ImageActor::New( ResourceImage::New( PAGE_IMAGES_LANDSCAPE[ (imageId+1) % NUMBER_OF_LANDSCAPE_IMAGE ] ) );
     }
     pageFront.Add(pageBack);
+
+    pageFront.SetRelayoutEnabled( false );
+    pageBack.SetRelayoutEnabled( false );
+
     return pageFront;
   }
 };
@@ -216,6 +228,8 @@ void PageTurnController::OnInit( Application& app )
 {
   // The Init signal is received once ( only ) during the Application lifetime
 
+  DemoHelper::RequestThemeChange();
+
   Stage::GetCurrent().KeyEventSignal().Connect(this, &PageTurnController::OnKeyEvent);
 
   Stage stage = Stage::GetCurrent();
@@ -223,6 +237,7 @@ void PageTurnController::OnInit( Application& app )
 
   // Create default View.
   mView = View::New();
+  mView.SetRelayoutEnabled( false );
   stage.Add( mView );
 
   Dali::Window winHandle = app.GetWindow();
@@ -236,6 +251,7 @@ void PageTurnController::OnInit( Application& app )
   mView.OrientationAnimationStartedSignal().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 );
@@ -244,6 +260,7 @@ 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 );