Commit bb56db19a88a1e5029217e2dcb52efbd7038999b
1 parent
a56865a0
Updated demos following StyleManager move to the public API
Change-Id: I988e00a3a2d36ec6f9f9341443c500f03aa70c72 Signed-off-by: David Steele <david.steele@samsung.com>
Showing
5 changed files
with
0 additions
and
48 deletions
demo/dali-table-view.cpp
| @@ -299,8 +299,6 @@ void DaliTableView::Initialize( Application& application ) | @@ -299,8 +299,6 @@ void DaliTableView::Initialize( Application& application ) | ||
| 299 | unsigned int degrees = 0; | 299 | unsigned int degrees = 0; |
| 300 | Rotate( degrees ); | 300 | Rotate( degrees ); |
| 301 | 301 | ||
| 302 | - //orientation.ChangedSignal().Connect( this, &DaliTableView::OrientationChanged ); | ||
| 303 | - | ||
| 304 | winHandle.ShowIndicator( Dali::Window::INVISIBLE ); | 302 | winHandle.ShowIndicator( Dali::Window::INVISIBLE ); |
| 305 | 303 | ||
| 306 | // Background animation | 304 | // Background animation |
| @@ -415,11 +413,6 @@ void DaliTableView::Populate() | @@ -415,11 +413,6 @@ void DaliTableView::Populate() | ||
| 415 | mScrollView.SetRulerY( mScrollRulerY ); | 413 | mScrollView.SetRulerY( mScrollRulerY ); |
| 416 | } | 414 | } |
| 417 | 415 | ||
| 418 | -void DaliTableView::OrientationChanged( Orientation orientation ) | ||
| 419 | -{ | ||
| 420 | - // TODO: Implement if orientation change required | ||
| 421 | -} | ||
| 422 | - | ||
| 423 | void DaliTableView::Rotate( unsigned int degrees ) | 416 | void DaliTableView::Rotate( unsigned int degrees ) |
| 424 | { | 417 | { |
| 425 | // Resize the root actor | 418 | // Resize the root actor |
examples/item-view/item-view-example.cpp
| @@ -209,8 +209,6 @@ public: | @@ -209,8 +209,6 @@ public: | ||
| 209 | TOOLBAR_IMAGE, | 209 | TOOLBAR_IMAGE, |
| 210 | "" ); | 210 | "" ); |
| 211 | 211 | ||
| 212 | - //app.GetWindow().GetOrientation().ChangedSignal().Connect( this, &ItemViewExample::OnOrientationChanged ); | ||
| 213 | - | ||
| 214 | // Create an edit mode button. (left of toolbar) | 212 | // Create an edit mode button. (left of toolbar) |
| 215 | Toolkit::PushButton editButton = Toolkit::PushButton::New(); | 213 | Toolkit::PushButton editButton = Toolkit::PushButton::New(); |
| 216 | editButton.SetUnselectedImage( EDIT_IMAGE ); | 214 | editButton.SetUnselectedImage( EDIT_IMAGE ); |
| @@ -380,24 +378,6 @@ public: | @@ -380,24 +378,6 @@ public: | ||
| 380 | mItemView.ActivateLayout( layoutId, Vector3(stageSize.x, stageSize.y, stageSize.x), 0.0f ); | 378 | mItemView.ActivateLayout( layoutId, Vector3(stageSize.x, stageSize.y, stageSize.x), 0.0f ); |
| 381 | } | 379 | } |
| 382 | 380 | ||
| 383 | - /** | ||
| 384 | - * Orientation changed signal callback | ||
| 385 | - * @param orientation | ||
| 386 | - */ | ||
| 387 | - void OnOrientationChanged( Orientation orientation ) | ||
| 388 | - { | ||
| 389 | - const unsigned int angle = orientation.GetDegrees(); | ||
| 390 | - | ||
| 391 | - // If orientation really changed | ||
| 392 | - if( mOrientation != angle ) | ||
| 393 | - { | ||
| 394 | - // Remember orientation | ||
| 395 | - mOrientation = angle; | ||
| 396 | - | ||
| 397 | - SetLayout( mCurrentLayout ); | ||
| 398 | - } | ||
| 399 | - } | ||
| 400 | - | ||
| 401 | bool OnLayoutButtonClicked( Toolkit::Button button ) | 381 | bool OnLayoutButtonClicked( Toolkit::Button button ) |
| 402 | { | 382 | { |
| 403 | // Switch to the next layout | 383 | // Switch to the next layout |
examples/motion-blur/motion-blur-example.cpp
| @@ -193,7 +193,6 @@ public: | @@ -193,7 +193,6 @@ 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 | - // winHandle.GetOrientation().ChangedSignal().Connect( this, &MotionBlurExampleApp::OnOrientationChanged ); | ||
| 197 | unsigned int degrees = 0; | 196 | unsigned int degrees = 0; |
| 198 | Rotate( static_cast< DeviceOrientation >( degrees ) ); | 197 | Rotate( static_cast< DeviceOrientation >( degrees ) ); |
| 199 | 198 | ||
| @@ -289,18 +288,6 @@ public: | @@ -289,18 +288,6 @@ public: | ||
| 289 | #endif //#ifdef MULTIPLE_MOTION_BLURRED_ACTORS | 288 | #endif //#ifdef MULTIPLE_MOTION_BLURRED_ACTORS |
| 290 | } | 289 | } |
| 291 | 290 | ||
| 292 | - ////////////////////////////////////////////////////////////// | ||
| 293 | - // | ||
| 294 | - // Device Orientation Support | ||
| 295 | - // | ||
| 296 | - // | ||
| 297 | - | ||
| 298 | - void OnOrientationChanged( Orientation orientation ) | ||
| 299 | - { | ||
| 300 | - unsigned int degrees = orientation.GetDegrees(); | ||
| 301 | - Rotate( static_cast< DeviceOrientation >( degrees ) ); | ||
| 302 | - } | ||
| 303 | - | ||
| 304 | void Rotate( DeviceOrientation orientation ) | 291 | void Rotate( DeviceOrientation orientation ) |
| 305 | { | 292 | { |
| 306 | // Resize the root actor | 293 | // Resize the root actor |
examples/motion-stretch/motion-stretch-example.cpp
| @@ -167,7 +167,6 @@ public: | @@ -167,7 +167,6 @@ public: | ||
| 167 | winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE ); | 167 | winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE ); |
| 168 | winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); | 168 | winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); |
| 169 | 169 | ||
| 170 | - // winHandle.GetOrientation().ChangedSignal().Connect( this, &MotionStretchExampleApp::OnOrientationChanged ); | ||
| 171 | unsigned int degrees = 0; | 170 | unsigned int degrees = 0; |
| 172 | Rotate( static_cast< DeviceOrientation >( degrees ) ); | 171 | Rotate( static_cast< DeviceOrientation >( degrees ) ); |
| 173 | 172 | ||
| @@ -196,12 +195,6 @@ public: | @@ -196,12 +195,6 @@ public: | ||
| 196 | // | 195 | // |
| 197 | // | 196 | // |
| 198 | 197 | ||
| 199 | - void OnOrientationChanged( Orientation orientation ) | ||
| 200 | - { | ||
| 201 | - unsigned int degrees = orientation.GetDegrees(); | ||
| 202 | - Rotate( static_cast< DeviceOrientation >( degrees ) ); | ||
| 203 | - } | ||
| 204 | - | ||
| 205 | void Rotate( DeviceOrientation orientation ) | 198 | void Rotate( DeviceOrientation orientation ) |
| 206 | { | 199 | { |
| 207 | // Resize the root actor | 200 | // Resize the root actor |
shared/view.h
| @@ -20,7 +20,6 @@ | @@ -20,7 +20,6 @@ | ||
| 20 | 20 | ||
| 21 | #include <dali-toolkit/dali-toolkit.h> | 21 | #include <dali-toolkit/dali-toolkit.h> |
| 22 | #include <dali-toolkit/devel-api/controls/tool-bar/tool-bar.h> | 22 | #include <dali-toolkit/devel-api/controls/tool-bar/tool-bar.h> |
| 23 | -#include <dali-toolkit/devel-api/styling/style-manager.h> | ||
| 24 | 23 | ||
| 25 | 24 | ||
| 26 | namespace DemoHelper | 25 | namespace DemoHelper |