X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Faccessibility-manager%2Faccessibility-manager-impl.cpp;h=3a232147b7e2fa601dcfad583bb73e812e12592f;hb=acec18709fb959478c074c7a4cec4980719ac2eb;hp=5dfbbfd505300631afc79c2eaad03b1c9122df77;hpb=54b79663c1c11c06902a90e20e614959dc571d44;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp
index 5dfbbfd..3a23214 100644
--- a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp
+++ b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp
@@ -25,6 +25,7 @@
 #include <dali/devel-api/adaptor-framework/sound-player.h>
 #include <dali/public-api/animation/constraints.h>
 #include <dali/devel-api/events/hit-test-algorithm.h>
+#include <dali/devel-api/events/pan-gesture-devel.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
@@ -557,6 +558,18 @@ Vector2 AccessibilityManager::GetReadPosition() const
   return adaptor.GetReadPosition();
 }
 
+void AccessibilityManager::EnableAccessibility(bool enabled)
+{
+  AccessibilityAdaptor adaptor = AccessibilityAdaptor::Get();
+  adaptor.EnableAccessibility(enabled);
+}
+
+bool AccessibilityManager::IsEnabled() const
+{
+  AccessibilityAdaptor adaptor = AccessibilityAdaptor::Get();
+  return adaptor.IsEnabled();
+}
+
 void AccessibilityManager::SetGroupMode(bool enabled)
 {
   mIsFocusWithinGroup = enabled;
@@ -1302,26 +1315,11 @@ bool AccessibilityManager::AccessibilityActionStartStop()
   return mIsAccessibilityTtsEnabled;
 }
 
-bool AccessibilityManager::AccessibilityActionTouch(const TouchEvent& touch)
-{
-  bool handled = false;
-
-  // TODO: Need to convert the touchevent for the focused actor?
-
-  Dali::Toolkit::Control control = Dali::Toolkit::Control::DownCast(GetCurrentFocusActor());
-  if(control)
-  {
-    handled = GetImplementation( control ).OnAccessibilityTouch(touch);
-  }
-
-  return handled;
-}
-
 bool AccessibilityManager::HandlePanGesture(const AccessibilityGestureEvent& panEvent)
 {
   bool handled = false;
 
-  if( panEvent.state == AccessibilityGestureEvent::Started )
+  if( panEvent.state == AccessibilityGestureEvent::STARTED )
   {
     // Find the focusable actor at the event position
     Dali::HitTestAlgorithm::Results results;
@@ -1336,24 +1334,22 @@ bool AccessibilityManager::HandlePanGesture(const AccessibilityGestureEvent& pan
     }
   }
 
-  // Gesture::Finished (Up) events are delivered with previous (Motion) event position
+  // GestureState::FINISHED (Up) events are delivered with previous (Motion) event position
   // Use the real previous position; otherwise we may incorrectly get a ZERO velocity
-  if ( AccessibilityGestureEvent::Finished != panEvent.state )
+  if ( AccessibilityGestureEvent::FINISHED != panEvent.state )
   {
-    // Store the previous position for next Gesture::Finished iteration.
+    // Store the previous position for next GestureState::FINISHED iteration.
     mPreviousPosition = panEvent.previousPosition;
   }
 
   Actor rootActor = Stage::GetCurrent().GetRootLayer();
 
-  Dali::PanGesture pan( static_cast<Dali::Gesture::State>(panEvent.state) );
-
-  pan.time = panEvent.time;
-  pan.numberOfTouches = panEvent.numberOfTouches;
-  pan.screenPosition = panEvent.currentPosition;
-  pan.screenDisplacement = mPreviousPosition - panEvent.currentPosition;
-  pan.screenVelocity.x = pan.screenDisplacement.x / panEvent.timeDelta;
-  pan.screenVelocity.y = pan.screenDisplacement.y / panEvent.timeDelta;
+  Dali::PanGesture pan = DevelPanGesture::New( static_cast<Dali::GestureState>(panEvent.state) );
+  DevelPanGesture::SetTime( pan, panEvent.time );
+  DevelPanGesture::SetNumberOfTouches( pan, panEvent.numberOfTouches  );
+  DevelPanGesture::SetScreenPosition( pan, panEvent.currentPosition );
+  DevelPanGesture::SetScreenDisplacement( pan, mPreviousPosition - panEvent.currentPosition );
+  DevelPanGesture::SetScreenVelocity( pan, Vector2( pan.GetScreenDisplacement().x / panEvent.timeDelta, pan.GetScreenDisplacement().y / panEvent.timeDelta ) );
 
   // Only handle the pan gesture when the current focused actor is scrollable or within a scrollable actor
   while(mCurrentGesturedActor && mCurrentGesturedActor != rootActor && !handled)
@@ -1363,14 +1359,13 @@ bool AccessibilityManager::HandlePanGesture(const AccessibilityGestureEvent& pan
     {
       Vector2 localCurrent;
       control.ScreenToLocal( localCurrent.x, localCurrent.y, panEvent.currentPosition.x, panEvent.currentPosition.y );
-      pan.position = localCurrent;
+      DevelPanGesture::SetPosition( pan, localCurrent );
 
       Vector2 localPrevious;
       control.ScreenToLocal( localPrevious.x, localPrevious.y, mPreviousPosition.x, mPreviousPosition.y );
 
-      pan.displacement = localCurrent - localPrevious;
-      pan.velocity.x = pan.displacement.x / panEvent.timeDelta;
-      pan.velocity.y = pan.displacement.y / panEvent.timeDelta;
+      DevelPanGesture::SetDisplacement( pan, localCurrent - localPrevious );
+      DevelPanGesture::SetVelocity( pan, Vector2( pan.GetDisplacement().x / panEvent.timeDelta, pan.GetDisplacement().y / panEvent.timeDelta ));
 
       handled = GetImplementation( control ).OnAccessibilityPan(pan);
     }