Peter M. Groen / dali-demo

Commit 3616ba1d6b9a38906fd15cf1512d457f2989af42

Authored by Kimmo Hoikka
Committed by Gerrit Code Review
2 parents c0c23c97 7f0ca393

Merge "Use Orientation from Window not application class." into tizen

Inline Side-by-side
Showing 3 changed files with 9 additions and 8 deletions
demo/dali-table-view.cpp
  View file @3616ba1
@@ -324,17 +324,18 @@ void DaliTableView::Initialize( Application& application ) @@ -324,17 +324,18 @@ void DaliTableView::Initialize( Application& application )
324 // Remove constraints for inner cube effect 324 // Remove constraints for inner cube effect
325 ApplyCubeEffectToActors(); 325 ApplyCubeEffectToActors();
326 326
327 - // Set initial orientation  
328 - unsigned int degrees = application.GetOrientation().GetDegrees();  
329 - Rotate( degrees );  
330 -  
331 Dali::Window winHandle = application.GetWindow(); 327 Dali::Window winHandle = application.GetWindow();
332 winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT ); 328 winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT );
333 winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE ); 329 winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE );
334 winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE ); 330 winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE );
335 winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); 331 winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
336 332
  333 + // Set initial orientation
337 Dali::Orientation orientation = winHandle.GetOrientation(); 334 Dali::Orientation orientation = winHandle.GetOrientation();
  335 +
  336 + unsigned int degrees = winHandle.GetOrientation().GetDegrees();
  337 + Rotate( degrees );
  338 +
338 orientation.ChangedSignal().Connect( this, &DaliTableView::OrientationChanged ); 339 orientation.ChangedSignal().Connect( this, &DaliTableView::OrientationChanged );
339 340
340 winHandle.ShowIndicator( Dali::Window::INVISIBLE ); 341 winHandle.ShowIndicator( Dali::Window::INVISIBLE );
examples/motion-blur/motion-blur-example.cpp
  View file @3616ba1
@@ -193,8 +193,8 @@ public: @@ -193,8 +193,8 @@ public:
193 winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); 193 winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
194 194
195 // set initial orientation 195 // set initial orientation
196 - app.GetOrientation().ChangedSignal().Connect( this, &MotionBlurExampleApp::OnOrientationChanged );  
197 - unsigned int degrees = app.GetOrientation().GetDegrees(); 196 + winHandle.GetOrientation().ChangedSignal().Connect( this, &MotionBlurExampleApp::OnOrientationChanged );
  197 + unsigned int degrees = winHandle.GetOrientation().GetDegrees();
198 Rotate( static_cast< DeviceOrientation >( degrees ) ); 198 Rotate( static_cast< DeviceOrientation >( degrees ) );
199 199
200 200
examples/motion-stretch/motion-stretch-example.cpp
  View file @3616ba1
@@ -166,8 +166,8 @@ public: @@ -166,8 +166,8 @@ public:
166 winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE ); 166 winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE );
167 winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); 167 winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
168 168
169 - app.GetOrientation().ChangedSignal().Connect( this, &MotionStretchExampleApp::OnOrientationChanged );  
170 - unsigned int degrees = app.GetOrientation().GetDegrees(); 169 + winHandle.GetOrientation().ChangedSignal().Connect( this, &MotionStretchExampleApp::OnOrientationChanged );
  170 + unsigned int degrees = winHandle.GetOrientation().GetDegrees();
171 Rotate( static_cast< DeviceOrientation >( degrees ) ); 171 Rotate( static_cast< DeviceOrientation >( degrees ) );
172 172
173 173