projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix race-condition when window is resized or rotated." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-scene-holder.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
index
320c859
..
8bcb3c0
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
@@
-22,7
+22,6
@@
#include <dali/public-api/actors/actor.h>
#include <dali/public-api/actors/layer.h>
#include <dali/public-api/actors/actor.h>
#include <dali/public-api/actors/layer.h>
-#include <dali/public-api/common/stage.h>
#include <dali/public-api/object/base-object.h>
#include <dali/integration-api/adaptor-framework/adaptor.h>
#include <dali/public-api/object/base-object.h>
#include <dali/integration-api/adaptor-framework/adaptor.h>
@@
-106,9
+105,9
@@
Dali::Integration::SceneHolder::KeyEventGeneratedSignalType& SceneHolder::KeyEve
return mScene.KeyEventGeneratedSignal();
}
return mScene.KeyEventGeneratedSignal();
}
-Dali::Integration::SceneHolder::Touch
SignalType& SceneHolder::Touch
Signal()
+Dali::Integration::SceneHolder::Touch
EventSignalType& SceneHolder::Touched
Signal()
{
{
- return mScene.TouchSignal();
+ return mScene.Touch
ed
Signal();
}
Dali::Integration::SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()
}
Dali::Integration::SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()
@@
-116,6
+115,11
@@
Dali::Integration::SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSig
return mScene.WheelEventSignal();
}
return mScene.WheelEventSignal();
}
+Dali::Integration::SceneHolder::WheelEventGeneratedSignalType& SceneHolder::WheelEventGeneratedSignal()
+{
+ return mScene.WheelEventGeneratedSignal();
+}
+
Integration::Scene SceneHolder::GetScene()
{
return mScene;
Integration::Scene SceneHolder::GetScene()
{
return mScene;
@@
-226,9
+230,9
@@
SceneHolder::KeyEventGeneratedSignalType& SceneHolder::KeyEventGeneratedSignal()
return GetImplementation( *this ).KeyEventGeneratedSignal();
}
return GetImplementation( *this ).KeyEventGeneratedSignal();
}
-SceneHolder::Touch
SignalType& SceneHolder::Touch
Signal()
+SceneHolder::Touch
EventSignalType& SceneHolder::Touched
Signal()
{
{
- return GetImplementation( *this ).TouchSignal();
+ return GetImplementation( *this ).Touch
ed
Signal();
}
SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()
}
SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()
@@
-236,6
+240,11
@@
SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()
return GetImplementation( *this ).WheelEventSignal();
}
return GetImplementation( *this ).WheelEventSignal();
}
+SceneHolder::WheelEventGeneratedSignalType& SceneHolder::WheelEventGeneratedSignal()
+{
+ return GetImplementation( *this ).WheelEventGeneratedSignal();
+}
+
} // Integration
} // Dali
} // Integration
} // Dali