projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[Tizen] Add KeyEventGeneratedSignal for Get KeyEvent normally"
[platform/core/uifw/dali-core.git]
/
dali
/
integration-api
/
scene.h
diff --git
a/dali/integration-api/scene.h
b/dali/integration-api/scene.h
index
ae08e9a
..
c53c413
100755
(executable)
--- a/
dali/integration-api/scene.h
+++ b/
dali/integration-api/scene.h
@@
-55,18
+55,17
@@
class DALI_CORE_API Scene : public BaseHandle
public:
typedef Signal< void () > EventProcessingFinishedSignalType; ///< Event Processing finished signal type
typedef Signal< void (const Dali::KeyEvent&) > KeyEventSignalType; ///< Key event signal type
public:
typedef Signal< void () > EventProcessingFinishedSignalType; ///< Event Processing finished signal type
typedef Signal< void (const Dali::KeyEvent&) > KeyEventSignalType; ///< Key event 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::WheelEvent&) > WheelEventSignalType; ///< Touched signal type
/**
* @brief Create an initialized Scene handle.
*
typedef Signal< void (const Dali::TouchData&) > TouchSignalType; ///< Touch signal type
typedef Signal< void (const Dali::WheelEvent&) > WheelEventSignalType; ///< Touched signal type
/**
* @brief Create an initialized Scene handle.
*
- * @param[in] s
ize The size of the scene in pixels as a Vector
+ * @param[in] s
urface Binds this rendering surface to this scene
*
* @return a handle to a newly allocated Dali resource.
*/
*
* @return a handle to a newly allocated Dali resource.
*/
- static Scene New(
const Size& siz
e );
+ static Scene New(
Integration::RenderSurface& surfac
e );
/**
* @brief Downcast an Object handle to Scene handle.
/**
* @brief Downcast an Object handle to Scene handle.
@@
-200,12
+199,12
@@
public:
*
* @return The root layer
*/
*
* @return The root layer
*/
- void SetSurface( Integration::RenderSurface& surface
, bool forceUpdate
);
+ void SetSurface( Integration::RenderSurface& surface );
/**
* @brief Informs the scene that the set surface has been resized.
*/
/**
* @brief Informs the scene that the set surface has been resized.
*/
- void SurfaceResized(
bool forceUpdate
);
+ void SurfaceResized();
/**
* @brief Gets the rendering surface bound to the scene
/**
* @brief Gets the rendering surface bound to the scene
@@
-255,13
+254,6
@@
public:
KeyEventSignalType& KeyEventSignal();
/**
KeyEventSignalType& KeyEventSignal();
/**
- * @brief The user would connect to this signal to get a KeyEvent when KeyEvent is generated.
- *
- * @return The return is true if KeyEvent is consumed, otherwise false.
- */
- KeyEventGeneratedSignalType& KeyEventGeneratedSignal();
-
- /**
* @brief This signal is emitted when the screen is touched and when the touch ends
* (i.e. the down & up touch events only).
*
* @brief This signal is emitted when the screen is touched and when the touch ends
* (i.e. the down & up touch events only).
*