[Tizen] Revert "Changes after touch consumed behaviour change"

[platform/core/uifw/dali-demo.git] / shared / dali-table-view.cpp

diff --git a/shared/dali-table-view.cpp b/shared/dali-table-view.cpp
index 21cb43e..869bc7b 100644 (file)
--- a/shared/dali-table-view.cpp
+++ b/shared/dali-table-view.cpp
@@ -358,9 +358,9 @@ void DaliTableView::CreateFocusEffect()
 
   keyboardFocusManager.SetFocusIndicatorActor( mFocusEffect[0].actor );
 
-  // Connect to the on & off stage signals of the indicator which represents when it is enabled & disabled respectively
-  mFocusEffect[0].actor.OnStageSignal().Connect( this, &DaliTableView::OnFocusIndicatorEnabled );
-  mFocusEffect[0].actor.OffStageSignal().Connect( this, &DaliTableView::OnFocusIndicatorDisabled );
+  // Connect to the on & off scene signals of the indicator which represents when it is enabled & disabled respectively
+  mFocusEffect[0].actor.OnSceneSignal().Connect( this, &DaliTableView::OnFocusIndicatorEnabled );
+  mFocusEffect[0].actor.OffSceneSignal().Connect( this, &DaliTableView::OnFocusIndicatorDisabled );
 }
 
 void DaliTableView::OnFocusIndicatorEnabled( Actor /* actor */ )
@@ -557,7 +557,7 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit
   return focusableTile;
 }
 
-bool DaliTableView::OnTilePressed( Actor actor, const TouchData& event )
+bool DaliTableView::OnTilePressed( Actor actor, const TouchEvent& event )
 {
   return DoTilePress( actor, event.GetState( 0 ) );
 }
@@ -644,7 +644,7 @@ void DaliTableView::OnScrollComplete( const Dali::Vector2& position )
   accessibilityManager.SetCurrentFocusActor(mPages[mScrollView.GetCurrentPage()].GetChildAt(0) );
 }
 
-bool DaliTableView::OnScrollTouched( Actor actor, const TouchData& event )
+bool DaliTableView::OnScrollTouched( Actor actor, const TouchEvent& event )
 {
   if( PointState::DOWN == event.GetState( 0 ) )
   {