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 random crash in TCT when stderr is closed but we try to write to it" into...
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-Alignment.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp
index
bffde5d
..
fc015f1
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp
@@
-954,7
+954,7
@@
int UtcDaliAlignmentSizeSetP(void)
}
///////////////////////////////////////////////////////////////////////////////
}
///////////////////////////////////////////////////////////////////////////////
-static bool Touch
EventCallback(Actor actor, const TouchEvent
& event)
+static bool Touch
Callback(Actor actor, const TouchData
& event)
{
return false;
}
{
return false;
}
@@
-970,7
+970,7
@@
int UtcDaliAlignmentOnTouchEvent(void)
alignment.SetAnchorPoint(AnchorPoint::TOP_LEFT);
Stage::GetCurrent().Add(alignment);
alignment.SetAnchorPoint(AnchorPoint::TOP_LEFT);
Stage::GetCurrent().Add(alignment);
- alignment.Touch
edSignal().Connect(&TouchEvent
Callback);
+ alignment.Touch
Signal().Connect(&Touch
Callback);
application.Render();
application.SendNotification();
application.Render();
application.SendNotification();
@@
-978,7
+978,10
@@
int UtcDaliAlignmentOnTouchEvent(void)
application.SendNotification();
Integration::TouchEvent touchEvent(1);
application.SendNotification();
Integration::TouchEvent touchEvent(1);
- TouchPoint point(1, TouchPoint::Down, 20.0f, 20.0f);
+ Integration::Point point;
+ point.SetDeviceId( 1 );
+ point.SetState( PointState::DOWN);
+ point.SetScreenPosition( Vector2( 20.0f, 20.0f ) );
touchEvent.AddPoint(point);
application.ProcessEvent(touchEvent);
touchEvent.AddPoint(point);
application.ProcessEvent(touchEvent);