/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*/
#include <dali/public-api/object/base-object.h>
-#include <dali/integration-api/events/pan-gesture-event.h>
#include <dali/devel-api/adaptor-framework/accessibility-adaptor.h>
#include <dali/devel-api/adaptor-framework/accessibility-action-handler.h>
#include <dali/devel-api/adaptor-framework/accessibility-gesture-handler.h>
+#include <dali/devel-api/adaptor-framework/accessibility-gesture-event.h>
+#include <dali/integration-api/events/touch-integ.h>
namespace Dali
{
mIsEnabled = enabled;
}
- void SendPanGesture( const Dali::Integration::PanGestureEvent& panEvent );
+ void SendPanGesture( const AccessibilityGestureEvent& panEvent );
public:
bool HandleActionDownEvent();
bool HandleActionClearFocusEvent();
bool HandleActionScrollEvent(const TouchPoint& point, unsigned long timeStamp);
- bool HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp);
bool HandleActionBackEvent();
bool HandleActionEnableEvent();
bool HandleActionDisableEvent();
bool HandleActionReadFromTopEvent();
bool HandleActionReadFromNextEvent();
bool HandleActionZoomEvent();
- bool HandleActionReadIndicatorInformationEvent();
bool HandleActionReadPauseResumeEvent();
bool HandleActionStartStopEvent();
AccessibilityAdaptor::AccessibilityAdaptor()
: mIsEnabled(false),
+ mActionHandler(NULL),
+ mGestureHandler(NULL),
mReadPosition( 0.0f, 0.0f )
{
}
return mIsEnabled;
}
-void AccessibilityAdaptor::SendPanGesture( const Integration::PanGestureEvent& panEvent )
+void AccessibilityAdaptor::SendPanGesture( const AccessibilityGestureEvent& panEvent )
{
mGestureHandler->HandlePanGesture( panEvent );
}
{
if( mActionHandler )
{
- Dali::TouchEvent touchEvent;
- touchEvent.points.push_back( point );
- return mActionHandler->AccessibilityActionScroll( touchEvent );
- }
- return false;
-}
-
-bool AccessibilityAdaptor::HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp)
-{
- if( mActionHandler )
- {
- Dali::TouchEvent touchEvent;
- touchEvent.points.push_back( point );
- return mActionHandler->AccessibilityActionTouch( touchEvent );
+ Dali::TouchEvent touch = Integration::NewTouchEvent(timeStamp, point);
+ return mActionHandler->AccessibilityActionScroll( touch );
}
return false;
}
return false;
}
-bool AccessibilityAdaptor::HandleActionReadIndicatorInformationEvent()
-{
- if( mActionHandler )
- {
- return mActionHandler->AccessibilityActionReadIndicatorInformation();
- }
- return false;
-}
-
bool AccessibilityAdaptor::HandleActionReadPauseResumeEvent()
{
if( mActionHandler )
return Internal::Adaptor::GetImplementation(*this).HandleActionScrollEvent(point, timeStamp);
}
-bool AccessibilityAdaptor::HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp)
-{
- return Internal::Adaptor::GetImplementation(*this).HandleActionTouchEvent(point, timeStamp);
-}
-
bool AccessibilityAdaptor::HandleActionBackEvent()
{
return Internal::Adaptor::GetImplementation(*this).HandleActionBackEvent();
return Internal::Adaptor::GetImplementation(*this).HandleActionZoomEvent();
}
-bool AccessibilityAdaptor::HandleActionReadIndicatorInformationEvent()
-{
- return Internal::Adaptor::GetImplementation(*this).HandleActionReadIndicatorInformationEvent();
-}
-
bool AccessibilityAdaptor::HandleActionReadPauseResumeEvent()
{
return Internal::Adaptor::GetImplementation(*this).HandleActionReadPauseResumeEvent();
Dali::Internal::Adaptor::GetImplementation(adaptor).SetEnabled(enabled);
}
-void SendPanGesture( Dali::AccessibilityAdaptor adaptor, const Dali::Integration::PanGestureEvent& panEvent )
+void SendPanGesture( Dali::AccessibilityAdaptor adaptor, const Dali::AccessibilityGestureEvent& panEvent )
{
Dali::Internal::Adaptor::GetImplementation(adaptor).SendPanGesture( panEvent );
}