Peter M. Groen / dali-demo

Commit 68b302df953345584b6d0dc2c6a3ee6b4caf1684

Authored by Xiangyin Ma
1 parent 3f93d68f

Update with the change of Orientation in adaptor 

Change-Id: I6aafe45472d4e9d564af9873faa277b17d4d39fa
Inline Side-by-side
Showing 5 changed files with 8 additions and 10 deletions
demo/dali-table-view.cpp
  View file @68b302d
@@ -317,12 +317,10 @@ void DaliTableView::Initialize( Application& application ) @@ -317,12 +317,10 @@ void DaliTableView::Initialize( Application& application )
317 winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); 317 winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
318 318
319 // Set initial orientation 319 // Set initial orientation
320 - Dali::Orientation orientation = winHandle.GetOrientation();  
321 -  
322 - unsigned int degrees = winHandle.GetOrientation().GetDegrees(); 320 + unsigned int degrees = 0;
323 Rotate( degrees ); 321 Rotate( degrees );
324 322
325 - orientation.ChangedSignal().Connect( this, &DaliTableView::OrientationChanged ); 323 + //orientation.ChangedSignal().Connect( this, &DaliTableView::OrientationChanged );
326 324
327 winHandle.ShowIndicator( Dali::Window::INVISIBLE ); 325 winHandle.ShowIndicator( Dali::Window::INVISIBLE );
328 326
examples/item-view/item-view-example.cpp
  View file @68b302d
@@ -220,7 +220,7 @@ public: @@ -220,7 +220,7 @@ public:
220 TOOLBAR_IMAGE, 220 TOOLBAR_IMAGE,
221 "" ); 221 "" );
222 222
223 - app.GetWindow().GetOrientation().ChangedSignal().Connect( this, &ItemViewExample::OnOrientationChanged ); 223 + //app.GetWindow().GetOrientation().ChangedSignal().Connect( this, &ItemViewExample::OnOrientationChanged );
224 224
225 // Create an edit mode button. (left of toolbar) 225 // Create an edit mode button. (left of toolbar)
226 Toolkit::PushButton editButton = Toolkit::PushButton::New(); 226 Toolkit::PushButton editButton = Toolkit::PushButton::New();
examples/motion-blur/motion-blur-example.cpp
  View file @68b302d
@@ -191,8 +191,8 @@ public: @@ -191,8 +191,8 @@ public:
191 winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); 191 winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
192 192
193 // set initial orientation 193 // set initial orientation
194 - winHandle.GetOrientation().ChangedSignal().Connect( this, &MotionBlurExampleApp::OnOrientationChanged );  
195 - unsigned int degrees = winHandle.GetOrientation().GetDegrees(); 194 + // winHandle.GetOrientation().ChangedSignal().Connect( this, &MotionBlurExampleApp::OnOrientationChanged );
  195 + unsigned int degrees = 0;
196 Rotate( static_cast< DeviceOrientation >( degrees ) ); 196 Rotate( static_cast< DeviceOrientation >( degrees ) );
197 197
198 198
examples/motion-stretch/motion-stretch-example.cpp
  View file @68b302d
@@ -165,8 +165,8 @@ public: @@ -165,8 +165,8 @@ public:
165 winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE ); 165 winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE );
166 winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); 166 winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
167 167
168 - winHandle.GetOrientation().ChangedSignal().Connect( this, &MotionStretchExampleApp::OnOrientationChanged );  
169 - unsigned int degrees = winHandle.GetOrientation().GetDegrees(); 168 + // winHandle.GetOrientation().ChangedSignal().Connect( this, &MotionStretchExampleApp::OnOrientationChanged );
  169 + unsigned int degrees = 0;
170 Rotate( static_cast< DeviceOrientation >( degrees ) ); 170 Rotate( static_cast< DeviceOrientation >( degrees ) );
171 171
172 172
examples/page-turn-view/page-turn-view-example.cpp
  View file @68b302d
@@ -246,7 +246,7 @@ void PageTurnController::OnInit( Application&amp; app ) @@ -246,7 +246,7 @@ void PageTurnController::OnInit( Application&amp; app )
246 winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); 246 winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
247 247
248 // view will response to orientation change to display portrait or landscape views 248 // view will response to orientation change to display portrait or landscape views
249 - app.GetWindow().GetOrientation().ChangedSignal().Connect( this, &PageTurnController::OnOrientationAnimationStarted ); 249 + //app.GetWindow().GetOrientation().ChangedSignal().Connect( this, &PageTurnController::OnOrientationAnimationStarted );
250 250
251 mPageTurnPortraitView = PageTurnPortraitView::New( mPortraitPageFactory, stageSize ); 251 mPageTurnPortraitView = PageTurnPortraitView::New( mPortraitPageFactory, stageSize );
252 mPageTurnPortraitView.SetSpineShadowParameter( Vector2(70.f, 30.f) ); 252 mPageTurnPortraitView.SetSpineShadowParameter( Vector2(70.f, 30.f) );