/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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/type-registry.h>
#include <dali/integration-api/debug.h>
#include <dali/integration-api/events/touch-event-integ.h>
+#include <dali/integration-api/events/touch-data-integ.h>
#include <dali/integration-api/events/hover-event-integ.h>
-#include <dali/integration-api/events/gesture-requests.h>
// INTERNAL INCLUDES
#include <dali/internal/adaptor/common/adaptor-impl.h>
DALI_LOG_INFO(gAccessibilityAdaptorLogFilter, Debug::General, "[%s:%d] %d , %d\n", __FUNCTION__, __LINE__, x, y);
- mReadPosition.x = x;
- mReadPosition.y = y;
+ mReadPosition.x = static_cast< float > (x);
+ mReadPosition.y = static_cast< float > (y);
if( mActionHandler )
{
return ret;
}
-bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, unsigned long timeStamp)
+bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, uint32_t timeStamp)
{
bool ret = false;
// so always send the action to the action handler.
if( mActionHandler )
{
- Dali::TouchEvent event(timeStamp);
- event.points.push_back(point);
- ret = mActionHandler->AccessibilityActionScroll( event );
+ Dali::TouchData touchData = Integration::NewTouchData( timeStamp, point );
+ ret = mActionHandler->AccessibilityActionScroll( touchData );
}
Integration::TouchEvent touchEvent;
return ret;
}
-bool AccessibilityAdaptor::HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp)
+bool AccessibilityAdaptor::HandleActionTouchEvent(const TouchPoint& point, uint32_t timeStamp)
{
bool ret = false;
- Dali::TouchEvent touchEvent(timeStamp);
- touchEvent.points.push_back(point);
+ Dali::TouchData touchData = Integration::NewTouchData( timeStamp, point );
if( mActionHandler )
{
- ret = mActionHandler->AccessibilityActionTouch(touchEvent);
+ ret = mActionHandler->AccessibilityActionTouch( touchData );
}
return ret;
}