Peter M. Groen / dali-demo

Commit 48eeaf18c529ff3d16b52c66dba20bfd0e74ff9f

Authored by Francisco Santos
Committed by Adeel Kazmi
1 parent 27ea73a6

Merge branch 'devel/master' into devel/new_mesh 

Change-Id: I9877668ddf0ca176f873d8157b525f5eae24b0df
Inline Side-by-side
Showing 1 changed file with 11 additions and 11 deletions
demo/dali-table-view.cpp
  View file @48eeaf1
... ... @@ -391,12 +391,12 @@ void DaliTableView::Populate()
391 391 const Example& example = ( *iter );
392 392  
393 393 Actor tile = CreateTile( example.name, example.title, Vector3( tileParentMultiplier, tileParentMultiplier, 1.0f ), true );
394   - AccessibilityFocusManager accessibilityFocusManager = AccessibilityFocusManager::Get();
395   - accessibilityFocusManager.SetFocusOrder( tile, ++exampleCount );
396   - accessibilityFocusManager.SetAccessibilityAttribute( tile, Dali::Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL,
  394 + AccessibilityManager accessibilityManager = AccessibilityManager::Get();
  395 + accessibilityManager.SetFocusOrder( tile, ++exampleCount );
  396 + accessibilityManager.SetAccessibilityAttribute( tile, Dali::Toolkit::AccessibilityManager::ACCESSIBILITY_LABEL,
397 397 example.title );
398   - accessibilityFocusManager.SetAccessibilityAttribute( tile, Dali::Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, "Tile" );
399   - accessibilityFocusManager.SetAccessibilityAttribute( tile, Dali::Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT,
  398 + accessibilityManager.SetAccessibilityAttribute( tile, Dali::Toolkit::AccessibilityManager::ACCESSIBILITY_TRAIT, "Tile" );
  399 + accessibilityManager.SetAccessibilityAttribute( tile, Dali::Toolkit::AccessibilityManager::ACCESSIBILITY_HINT,
400 400 "You can run this example" );
401 401  
402 402 tile.SetPadding( Padding( margin, margin, margin, margin ) );
... ... @@ -555,7 +555,7 @@ bool DaliTableView::OnTilePressed( Actor actor, const TouchEvent& event )
555 555 std::string name = actor.GetName();
556 556 ExampleMapConstIter iter = mExampleMap.find( name );
557 557  
558   - AccessibilityFocusManager accessibilityFocusManager = AccessibilityFocusManager::Get();
  558 + AccessibilityManager accessibilityManager = AccessibilityManager::Get();
559 559  
560 560 if( iter != mExampleMap.end() )
561 561 {
... ... @@ -598,11 +598,11 @@ void DaliTableView::OnPressedAnimationFinished( Dali::Animation& source )
598 598 if( name == BUTTON_QUIT )
599 599 {
600 600 // Move focus to the OK button
601   - AccessibilityFocusManager accessibilityFocusManager = AccessibilityFocusManager::Get();
  601 + AccessibilityManager accessibilityManager = AccessibilityManager::Get();
602 602  
603 603 // Enable the group mode and wrap mode
604   - accessibilityFocusManager.SetGroupMode( true );
605   - accessibilityFocusManager.SetWrapMode( true );
  604 + accessibilityManager.SetGroupMode( true );
  605 + accessibilityManager.SetWrapMode( true );
606 606 }
607 607 }
608 608 else
... ... @@ -634,8 +634,8 @@ void DaliTableView::OnScrollComplete( const Dali::Vector2& position )
634 634 mScrolling = false;
635 635  
636 636 // move focus to 1st item of new page
637   - AccessibilityFocusManager accessibilityFocusManager = AccessibilityFocusManager::Get();
638   - accessibilityFocusManager.SetCurrentFocusActor(mPages[mScrollView.GetCurrentPage()].GetChildAt(0) );
  637 + AccessibilityManager accessibilityManager = AccessibilityManager::Get();
  638 + accessibilityManager.SetCurrentFocusActor(mPages[mScrollView.GetCurrentPage()].GetChildAt(0) );
639 639 }
640 640  
641 641 bool DaliTableView::OnScrollTouched( Actor actor, const TouchEvent& event )
... ...