Merge "Remove non-touch related deprecated APIs" into devel/master

[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 a8e53e5..3e84f98 100644 (file)
--- a/examples/page-turn-view/page-turn-view-example.cpp
+++ b/examples/page-turn-view/page-turn-view-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -169,7 +169,7 @@ public:
 private:
 
 
-  void OnWindowResized( Window::WindowSize size );
+  void OnWindowResized( Window window, Window::WindowSize size );
 
   void Rotate( DemoOrientation orientation );
 
@@ -210,13 +210,13 @@ void PageTurnExample::OnInit( Application& app )
   window.AddAvailableOrientation( Window::LANDSCAPE );
   window.AddAvailableOrientation( Window::PORTRAIT_INVERSE  );
   window.AddAvailableOrientation( Window::LANDSCAPE_INVERSE );
-  window.ResizedSignal().Connect( this, &PageTurnExample::OnWindowResized );
+  window.ResizeSignal().Connect( this, &PageTurnExample::OnWindowResized );
 
   Window::WindowSize size = window.GetSize();
   Rotate( size.GetWidth() > size.GetHeight() ? LANDSCAPE : PORTRAIT );
 }
 
-void PageTurnExample::OnWindowResized( Window::WindowSize size )
+void PageTurnExample::OnWindowResized( Window window, Window::WindowSize size )
 {
   Rotate( size.GetWidth() > size.GetHeight() ? LANDSCAPE : PORTRAIT );
 }
@@ -235,7 +235,7 @@ void PageTurnExample::Rotate( DemoOrientation orientation )
       if( !mPageTurnPortraitView )
       {
         mPageTurnPortraitView = PageTurnPortraitView::New( mPortraitPageFactory, stageSize );
-        mPageTurnPortraitView.SetParentOrigin( ParentOrigin::CENTER );
+        mPageTurnPortraitView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
       }
 
       if( mPageTurnLandscapeView )
@@ -249,7 +249,7 @@ void PageTurnExample::Rotate( DemoOrientation orientation )
       if( !mPageTurnLandscapeView )
       {
         mPageTurnLandscapeView = PageTurnLandscapeView::New( mLandscapePageFactory, Vector2(stageSize.x*0.5f, stageSize.y) );
-        mPageTurnLandscapeView.SetParentOrigin( ParentOrigin::CENTER );
+        mPageTurnLandscapeView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
       }
 
       if( mPageTurnPortraitView )