Change-Id: I6e46835fbb4bc4ce12215cfebd2c7486bde2faac
#define DALI_ACCESSIBILITY_ACTION_HANDLER_H
/*
#define DALI_ACCESSIBILITY_ACTION_HANDLER_H
/*
- * Copyright (c) 2019 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
// EXTERNAL INCLUDES
#include <dali/public-api/dali-adaptor-common.h>
// EXTERNAL INCLUDES
#include <dali/public-api/dali-adaptor-common.h>
-#include <dali/public-api/events/touch-data.h>
+#include <dali/public-api/events/touch-event.h>
/**
* Perform the accessibility action associated with a scroll event.
/**
* Perform the accessibility action associated with a scroll event.
- * @param touchData The touch point (and time) of the event.
+ * @param touch The touch point (and time) of the event.
* @return whether the focus is cleared or not.
*/
* @return whether the focus is cleared or not.
*/
- virtual bool AccessibilityActionScroll( Dali::TouchData& touchData ) = 0;
+ virtual bool AccessibilityActionScroll( Dali::TouchEvent& touch ) = 0;
/**
* Perform the accessibility action to move focus to the previous focusable actor (by one finger flick up).
/**
* Perform the accessibility action to move focus to the previous focusable actor (by one finger flick up).
/**
* Perform the accessibility action to mouse move (by one finger tap & hold and move).
/**
* Perform the accessibility action to mouse move (by one finger tap & hold and move).
- * @param touchData touch data
+ * @param touch touch data
* @return whether the accessibility action is performed or not.
*/
* @return whether the accessibility action is performed or not.
*/
- virtual bool AccessibilityActionTouch(const Dali::TouchData& touchData) = 0;
+ virtual bool AccessibilityActionTouch(const Dali::TouchEvent& touch) = 0;
}; // class AccessibilityActionHandler
}; // class AccessibilityActionHandler
#define DALI_WEB_ENGINE_PLUGIN_H
/*
#define DALI_WEB_ENGINE_PLUGIN_H
/*
- * Copyright (c) 2018 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
/**
* @brief WebEnginePlugin is an abstract interface, used by dali-adaptor to access WebEngine plugin.
/**
* @brief WebEnginePlugin is an abstract interface, used by dali-adaptor to access WebEngine plugin.
/**
* @brief Sends Touch Events.
*/
/**
* @brief Sends Touch Events.
*/
- virtual bool SendTouchEvent( const TouchData& touch ) = 0;
+ virtual bool SendTouchEvent( const TouchEvent& touch ) = 0;
/**
* @brief Sends Key Events.
/**
* @brief Sends Key Events.
- * Copyright (c) 2018 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
return GetImplementation( *this ).SetSize( width, height );
}
return GetImplementation( *this ).SetSize( width, height );
}
-bool WebEngine::SendTouchEvent( const TouchData& touch )
+bool WebEngine::SendTouchEvent( const TouchEvent& touch )
{
return GetImplementation( *this ).SendTouchEvent( touch );
}
{
return GetImplementation( *this ).SendTouchEvent( touch );
}
#define DALI_WEB_ENGINE_H
/*
#define DALI_WEB_ENGINE_H
/*
- * Copyright (c) 2018 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
/**
* @brief Sends Touch Events.
*/
/**
* @brief Sends Touch Events.
*/
- bool SendTouchEvent( const TouchData& touch );
+ bool SendTouchEvent( const TouchEvent& touch );
/**
* @brief Sends key Events.
/**
* @brief Sends key Events.
namespace Dali
{
struct KeyEvent;
namespace Dali
{
struct KeyEvent;
struct WheelEvent;
class RenderTaskList;
struct WheelEvent;
class RenderTaskList;
typedef Signal< void (const KeyEvent&) > KeyEventSignalType; ///< Key event signal type
typedef Signal< void (const KeyEvent&) > KeyEventSignalType; ///< Key event signal type
-typedef Signal< void (const TouchData&) > TouchSignalType; ///< Touch signal type
+typedef Signal< void (const TouchEvent&) > TouchSignalType; ///< Touch signal type
typedef Signal< void (const WheelEvent&) > WheelEventSignalType; ///< Touched signal type
typedef Signal< void (const WheelEvent&) > WheelEventSignalType; ///< Touched signal type
#define DALI_INTEGRATION_SCENEHOLDER_H
/*
#define DALI_INTEGRATION_SCENEHOLDER_H
/*
- * Copyright (c) 2019 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
class Actor;
class Layer;
class Any;
class Actor;
class Layer;
class Any;
struct TouchPoint;
struct WheelEvent;
struct KeyEvent;
struct TouchPoint;
struct WheelEvent;
struct KeyEvent;
typedef Signal< bool (const Dali::KeyEvent&) > KeyEventGeneratedSignalType; ///< Key event generated signal type
typedef Signal< bool (const Dali::KeyEvent&) > KeyEventGeneratedSignalType; ///< Key event generated signal type
- typedef Signal< void (const Dali::TouchData&) > TouchSignalType; ///< Touch signal type
+ typedef Signal< void (const Dali::TouchEvent&) > TouchSignalType; ///< Touch signal type
typedef Signal< void (const Dali::WheelEvent&) > WheelEventSignalType; ///< Touched signal type
typedef Signal< void (const Dali::WheelEvent&) > WheelEventSignalType; ///< Touched signal type
* An interrupted event will also be emitted (if it occurs).
* A callback of the following type may be connected:
* @code
* An interrupted event will also be emitted (if it occurs).
* A callback of the following type may be connected:
* @code
- * void YourCallbackName( TouchData event );
+ * void YourCallbackName( TouchEvent event );
* @endcode
* @return The touch signal to connect to
* @note Motion events are not emitted.
* @endcode
* @return The touch signal to connect to
* @note Motion events are not emitted.
- * Copyright (c) 2019 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.
*
* 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/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/touch-integ.h>
#include <dali/integration-api/events/hover-event-integ.h>
// INTERNAL INCLUDES
#include <dali/integration-api/events/hover-event-integ.h>
// INTERNAL INCLUDES
// so always send the action to the action handler.
if( mActionHandler )
{
// so always send the action to the action handler.
if( mActionHandler )
{
- Dali::TouchData touchData = Integration::NewTouchData( timeStamp, point );
- ret = mActionHandler->AccessibilityActionScroll( touchData );
+ Dali::TouchEvent touch = Integration::NewTouchEvent( timeStamp, point );
+ ret = mActionHandler->AccessibilityActionScroll( touch );
}
Integration::TouchEvent touchEvent;
}
Integration::TouchEvent touchEvent;
- Dali::TouchData touchData = Integration::NewTouchData( timeStamp, point );
+ Dali::TouchEvent touch = Integration::NewTouchEvent( timeStamp, point );
- ret = mActionHandler->AccessibilityActionTouch( touchData );
+ ret = mActionHandler->AccessibilityActionTouch( touch );
- * Copyright (c) 2018 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
mPlugin->SetSize( width, height );
}
mPlugin->SetSize( width, height );
}
-bool WebEngine::SendTouchEvent( const Dali::TouchData& touch )
+bool WebEngine::SendTouchEvent( const Dali::TouchEvent& touch )
{
return mPlugin->SendTouchEvent( touch );
}
{
return mPlugin->SendTouchEvent( touch );
}
#define DALI_WEB_ENGINE_IMPL_H
/*
#define DALI_WEB_ENGINE_IMPL_H
/*
- * Copyright (c) 2018 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
/**
* @copydoc Dali::WebEngine::SendTouchEvent()
*/
/**
* @copydoc Dali::WebEngine::SendTouchEvent()
*/
- bool SendTouchEvent( const Dali::TouchData& touch );
+ bool SendTouchEvent( const Dali::TouchEvent& touch );
/**
* @copydoc Dali::WebEngine::SendKeyEvent()
/**
* @copydoc Dali::WebEngine::SendKeyEvent()
class Actor;
class Layer;
class RenderTaskList;
class Actor;
class Layer;
class RenderTaskList;
using FocusChangeSignalType = Signal< void (Window,bool) >; ///< Window focus signal type @SINCE_1_4.35
using ResizeSignalType = Signal< void (Window,WindowSize) >; ///< Window resized signal type @SINCE_1_4.35
using KeyEventSignalType = Signal< void (const KeyEvent&) >; ///< Key event signal type
using FocusChangeSignalType = Signal< void (Window,bool) >; ///< Window focus signal type @SINCE_1_4.35
using ResizeSignalType = Signal< void (Window,WindowSize) >; ///< Window resized signal type @SINCE_1_4.35
using KeyEventSignalType = Signal< void (const KeyEvent&) >; ///< Key event signal type
- using TouchSignalType = Signal< void (const TouchData&) >; ///< Touch signal type
+ using TouchSignalType = Signal< void (const TouchEvent&) >; ///< Touch signal type
* An interrupted event will also be emitted (if it occurs).
* A callback of the following type may be connected:
* @code
* An interrupted event will also be emitted (if it occurs).
* A callback of the following type may be connected:
* @code
- * void YourCallbackName(const TouchData& event);
+ * void YourCallbackName(const TouchEvent& event);
* @endcode
*
* @SINCE_1_9.21
* @endcode
*
* @SINCE_1_9.21