projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "(Partial update) Fix surface damage area" into devel/master
[platform/core/uifw/dali-adaptor.git]
/
dali
/
integration-api
/
adaptor-framework
/
scene-holder-impl.h
diff --git
a/dali/integration-api/adaptor-framework/scene-holder-impl.h
b/dali/integration-api/adaptor-framework/scene-holder-impl.h
index
b7bd53b
..
2628526
100644
(file)
--- a/
dali/integration-api/adaptor-framework/scene-holder-impl.h
+++ b/
dali/integration-api/adaptor-framework/scene-holder-impl.h
@@
-43,7
+43,7
@@
class Actor;
class Layer;
class WheelEvent;
struct TouchPoint;
class Layer;
class WheelEvent;
struct TouchPoint;
-
struct
KeyEvent;
+
class
KeyEvent;
namespace Integration
{
namespace Integration
{
@@
-225,9
+225,9
@@
public:
Dali::Integration::SceneHolder::KeyEventGeneratedSignalType& KeyEventGeneratedSignal() { return mScene.KeyEventGeneratedSignal(); }
/**
Dali::Integration::SceneHolder::KeyEventGeneratedSignalType& KeyEventGeneratedSignal() { return mScene.KeyEventGeneratedSignal(); }
/**
- * @copydoc Dali::Integration::SceneHolder::TouchSignal()
+ * @copydoc Dali::Integration::SceneHolder::Touch
ed
Signal()
*/
*/
- Dali::Integration::SceneHolder::Touch
SignalType& TouchSignal() { return mScene.Touch
Signal(); }
+ Dali::Integration::SceneHolder::Touch
EventSignalType& TouchedSignal() { return mScene.Touched
Signal(); }
/**
* @copydoc Dali::Integration::SceneHolder::WheelEventSignal()
/**
* @copydoc Dali::Integration::SceneHolder::WheelEventSignal()