summaryrefslogtreecommitdiff
path: root/demo
diff options
context:
space:
mode:
authorRichard Huang <r.huang@samsung.com>2015-06-02 17:48:48 +0100
committerRichard Huang <r.huang@samsung.com>2015-06-02 09:51:26 -0700
commit02e02206fb56fd16c6108a640c01b21c523b7a78 (patch)
treebd75b64b7f165e72d55e796445606b959a76dea2 /demo
parentd317164fd74f9107f52d3a7fc4d901e85f7a75c5 (diff)
downloaddali-demo-02e02206fb56fd16c6108a640c01b21c523b7a78.tar.gz
dali-demo-02e02206fb56fd16c6108a640c01b21c523b7a78.tar.bz2
dali-demo-02e02206fb56fd16c6108a640c01b21c523b7a78.zip
Renamed FocusManager to AccessibilityFocusManager
Change-Id: Iec4025ccaa95c00a19072cbb42a7b6ba4264b364
Diffstat (limited to 'demo')
-rw-r--r--demo/dali-table-view.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp
index 5a64f315..162a0e0c 100644
--- a/demo/dali-table-view.cpp
+++ b/demo/dali-table-view.cpp
@@ -387,12 +387,12 @@ void DaliTableView::Populate()
const Example& example = ( *iter );
Actor tile = CreateTile( example.name, example.title, Vector3( tileParentMultiplier, tileParentMultiplier, 1.0f ), true );
- FocusManager focusManager = FocusManager::Get();
- focusManager.SetFocusOrder( tile, ++exampleCount );
- focusManager.SetAccessibilityAttribute( tile, Dali::Toolkit::FocusManager::ACCESSIBILITY_LABEL,
+ AccessibilityFocusManager accessibilityFocusManager = AccessibilityFocusManager::Get();
+ accessibilityFocusManager.SetFocusOrder( tile, ++exampleCount );
+ accessibilityFocusManager.SetAccessibilityAttribute( tile, Dali::Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL,
example.title );
- focusManager.SetAccessibilityAttribute( tile, Dali::Toolkit::FocusManager::ACCESSIBILITY_TRAIT, "Tile" );
- focusManager.SetAccessibilityAttribute( tile, Dali::Toolkit::FocusManager::ACCESSIBILITY_HINT,
+ accessibilityFocusManager.SetAccessibilityAttribute( tile, Dali::Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, "Tile" );
+ accessibilityFocusManager.SetAccessibilityAttribute( tile, Dali::Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT,
"You can run this example" );
tile.SetPadding( Padding( margin, margin, margin, margin ) );
@@ -551,7 +551,7 @@ bool DaliTableView::OnTilePressed( Actor actor, const TouchEvent& event )
std::string name = actor.GetName();
ExampleMapConstIter iter = mExampleMap.find( name );
- FocusManager focusManager = FocusManager::Get();
+ AccessibilityFocusManager accessibilityFocusManager = AccessibilityFocusManager::Get();
if( iter != mExampleMap.end() )
{
@@ -594,11 +594,11 @@ void DaliTableView::OnPressedAnimationFinished( Dali::Animation& source )
if( name == BUTTON_QUIT )
{
// Move focus to the OK button
- FocusManager focusManager = FocusManager::Get();
+ AccessibilityFocusManager accessibilityFocusManager = AccessibilityFocusManager::Get();
// Enable the group mode and wrap mode
- focusManager.SetGroupMode( true );
- focusManager.SetWrapMode( true );
+ accessibilityFocusManager.SetGroupMode( true );
+ accessibilityFocusManager.SetWrapMode( true );
}
}
else
@@ -630,8 +630,8 @@ void DaliTableView::OnScrollComplete( const Dali::Vector2& position )
mScrolling = false;
// move focus to 1st item of new page
- FocusManager focusManager = FocusManager::Get();
- focusManager.SetCurrentFocusActor(mPages[mScrollView.GetCurrentPage()].GetChildAt(0) );
+ AccessibilityFocusManager accessibilityFocusManager = AccessibilityFocusManager::Get();
+ accessibilityFocusManager.SetCurrentFocusActor(mPages[mScrollView.GetCurrentPage()].GetChildAt(0) );
}
bool DaliTableView::OnScrollTouched( Actor actor, const TouchEvent& event )