projects
/
platform
/
core
/
uifw
/
dali-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes after TouchedSignal changes
[platform/core/uifw/dali-demo.git]
/
examples
/
metaball-refrac
/
metaball-refrac-example.cpp
diff --git
a/examples/metaball-refrac/metaball-refrac-example.cpp
b/examples/metaball-refrac/metaball-refrac-example.cpp
index
43cd963
..
021a2ac
100644
(file)
--- a/
examples/metaball-refrac/metaball-refrac-example.cpp
+++ b/
examples/metaball-refrac/metaball-refrac-example.cpp
@@
-338,7
+338,7
@@
void MetaballRefracController::Create( Application& app )
CreateAnimations();
// Connect the callback to the touch signal on the mesh actor
CreateAnimations();
// Connect the callback to the touch signal on the mesh actor
- window.GetRootLayer().TouchSignal().Connect( this, &MetaballRefracController::OnTouch );
+ window.GetRootLayer().Touch
ed
Signal().Connect( this, &MetaballRefracController::OnTouch );
}
Geometry MetaballRefracController::CreateGeometry( bool aspectMappedTexture )
}
Geometry MetaballRefracController::CreateGeometry( bool aspectMappedTexture )
@@
-759,7
+759,7
@@
bool MetaballRefracController::OnTouch( Actor actor, const TouchEvent& touch )
void MetaballRefracController::OnKeyEvent(const KeyEvent& event)
{
void MetaballRefracController::OnKeyEvent(const KeyEvent& event)
{
- if( event.
state == KeyEvent::Down
)
+ if( event.
GetState() == KeyEvent::DOWN
)
{
if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
{
{
if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
{