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
/
rendering-triangle
/
rendering-triangle.cpp
diff --git
a/examples/rendering-triangle/rendering-triangle.cpp
b/examples/rendering-triangle/rendering-triangle.cpp
index
ddad128
..
9a2b022
100644
(file)
--- a/
examples/rendering-triangle/rendering-triangle.cpp
+++ b/
examples/rendering-triangle/rendering-triangle.cpp
@@
-92,7
+92,7
@@
public:
CreateActor();
// Respond to a click anywhere on the window
CreateActor();
// Respond to a click anywhere on the window
- window.GetRootLayer().TouchSignal().Connect( this, &DrawTriangleController::OnTouch );
+ window.GetRootLayer().Touch
ed
Signal().Connect( this, &DrawTriangleController::OnTouch );
// Respond to key events
window.KeyEventSignal().Connect( this, &DrawTriangleController::OnKeyEvent );
// Respond to key events
window.KeyEventSignal().Connect( this, &DrawTriangleController::OnKeyEvent );
@@
-113,7
+113,7
@@
public:
*/
void OnKeyEvent( const KeyEvent& event )
{
*/
void OnKeyEvent( const KeyEvent& event )
{
- if( event.GetState() == KeyEvent::D
own
)
+ if( event.GetState() == KeyEvent::D
OWN
)
{
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 ) )
{
@@
-134,8
+134,8
@@
public:
Vector2( -1.0f, 1.0f )
};
Vector2( -1.0f, 1.0f )
};
-
PropertyBuffer vertexBuffer = Property
Buffer::New( Property::Map()
-
.Add( "aPosition", Property::VECTOR2 ) );
+
VertexBuffer vertexBuffer = Vertex
Buffer::New( Property::Map()
+ .Add( "aPosition", Property::VECTOR2 ) );
vertexBuffer.SetData( vertices, sizeof(vertices) / sizeof(Vector2) );
mGeometry = Geometry::New();
vertexBuffer.SetData( vertices, sizeof(vertices) / sizeof(Vector2) );
mGeometry = Geometry::New();