From 68b302df953345584b6d0dc2c6a3ee6b4caf1684 Mon Sep 17 00:00:00 2001 From: Xiangyin Ma Date: Fri, 22 May 2015 17:16:28 +0100 Subject: [PATCH] Update with the change of Orientation in adaptor Change-Id: I6aafe45472d4e9d564af9873faa277b17d4d39fa --- demo/dali-table-view.cpp | 6 ++---- examples/item-view/item-view-example.cpp | 2 +- examples/motion-blur/motion-blur-example.cpp | 4 ++-- examples/motion-stretch/motion-stretch-example.cpp | 4 ++-- examples/page-turn-view/page-turn-view-example.cpp | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp index 9577a2e..7188db9 100644 --- a/demo/dali-table-view.cpp +++ b/demo/dali-table-view.cpp @@ -317,12 +317,10 @@ void DaliTableView::Initialize( Application& application ) winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); // Set initial orientation - Dali::Orientation orientation = winHandle.GetOrientation(); - - unsigned int degrees = winHandle.GetOrientation().GetDegrees(); + unsigned int degrees = 0; Rotate( degrees ); - orientation.ChangedSignal().Connect( this, &DaliTableView::OrientationChanged ); + //orientation.ChangedSignal().Connect( this, &DaliTableView::OrientationChanged ); winHandle.ShowIndicator( Dali::Window::INVISIBLE ); diff --git a/examples/item-view/item-view-example.cpp b/examples/item-view/item-view-example.cpp index fc94b02..c3b858d 100644 --- a/examples/item-view/item-view-example.cpp +++ b/examples/item-view/item-view-example.cpp @@ -220,7 +220,7 @@ public: TOOLBAR_IMAGE, "" ); - app.GetWindow().GetOrientation().ChangedSignal().Connect( this, &ItemViewExample::OnOrientationChanged ); + //app.GetWindow().GetOrientation().ChangedSignal().Connect( this, &ItemViewExample::OnOrientationChanged ); // Create an edit mode button. (left of toolbar) Toolkit::PushButton editButton = Toolkit::PushButton::New(); diff --git a/examples/motion-blur/motion-blur-example.cpp b/examples/motion-blur/motion-blur-example.cpp index fc37bd1..d783a3b 100644 --- a/examples/motion-blur/motion-blur-example.cpp +++ b/examples/motion-blur/motion-blur-example.cpp @@ -191,8 +191,8 @@ public: winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); // set initial orientation - winHandle.GetOrientation().ChangedSignal().Connect( this, &MotionBlurExampleApp::OnOrientationChanged ); - unsigned int degrees = winHandle.GetOrientation().GetDegrees(); + // winHandle.GetOrientation().ChangedSignal().Connect( this, &MotionBlurExampleApp::OnOrientationChanged ); + unsigned int degrees = 0; Rotate( static_cast< DeviceOrientation >( degrees ) ); diff --git a/examples/motion-stretch/motion-stretch-example.cpp b/examples/motion-stretch/motion-stretch-example.cpp index ff60371..ebfa809 100644 --- a/examples/motion-stretch/motion-stretch-example.cpp +++ b/examples/motion-stretch/motion-stretch-example.cpp @@ -165,8 +165,8 @@ public: winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE ); winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); - winHandle.GetOrientation().ChangedSignal().Connect( this, &MotionStretchExampleApp::OnOrientationChanged ); - unsigned int degrees = winHandle.GetOrientation().GetDegrees(); + // winHandle.GetOrientation().ChangedSignal().Connect( this, &MotionStretchExampleApp::OnOrientationChanged ); + unsigned int degrees = 0; Rotate( static_cast< DeviceOrientation >( degrees ) ); diff --git a/examples/page-turn-view/page-turn-view-example.cpp b/examples/page-turn-view/page-turn-view-example.cpp index c0fc98c..39e329e 100644 --- a/examples/page-turn-view/page-turn-view-example.cpp +++ b/examples/page-turn-view/page-turn-view-example.cpp @@ -246,7 +246,7 @@ void PageTurnController::OnInit( Application& app ) winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); // view will response to orientation change to display portrait or landscape views - app.GetWindow().GetOrientation().ChangedSignal().Connect( this, &PageTurnController::OnOrientationAnimationStarted ); + //app.GetWindow().GetOrientation().ChangedSignal().Connect( this, &PageTurnController::OnOrientationAnimationStarted ); mPageTurnPortraitView = PageTurnPortraitView::New( mPortraitPageFactory, stageSize ); mPageTurnPortraitView.SetSpineShadowParameter( Vector2(70.f, 30.f) ); -- 2.7.4