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
(Touch) Updated programming guide, Automated Tests & KeyboardFocusManager to use...
[platform/core/uifw/dali-toolkit.git]
/
docs
/
content
/
shared-javascript-and-cpp-documentation
/
programming-languages.md
diff --git
a/docs/content/shared-javascript-and-cpp-documentation/programming-languages.md
b/docs/content/shared-javascript-and-cpp-documentation/programming-languages.md
index
e2c4de2
..
5938e53
100644
(file)
--- a/
docs/content/shared-javascript-and-cpp-documentation/programming-languages.md
+++ b/
docs/content/shared-javascript-and-cpp-documentation/programming-languages.md
@@
-13,15
+13,15
@@
actor.SetParentOrigin( Dali::ParentOrigin::CENTER );
actor.SetAnchorPoint( Dali::AnchorPoint::CENTER );
Dali::Stage::GetCurrent().Add( actor );
...
actor.SetAnchorPoint( Dali::AnchorPoint::CENTER );
Dali::Stage::GetCurrent().Add( actor );
...
-bool OnPressed( Dali::Actor, const Touch
Event& event
)
+bool OnPressed( Dali::Actor, const Touch
Data& touch
)
{
Dali::Animation anim = Dali::Animation::New( 1.5f );
{
Dali::Animation anim = Dali::Animation::New( 1.5f );
- anim.AnimateTo( Property( actor, Actor::Property::POSITION ), Vector3( 200,
-100,0
), AlphaFunctions::Bounce );
+ anim.AnimateTo( Property( actor, Actor::Property::POSITION ), Vector3( 200,
-100, 0
), AlphaFunctions::Bounce );
anim.play();
return true; // consume the touch event
}
...
anim.play();
return true; // consume the touch event
}
...
-actor.Touch
ed
Signal().Connect( &OnPressed );
+actor.TouchSignal().Connect( &OnPressed );
~~~
*/
~~~
*/
@@
-34,16
+34,16
@@
actor.parentOrigin = dali.CENTER;
actor.anchorPoint = dali.CENTER;
dali.stage.add( actor );
...
actor.anchorPoint = dali.CENTER;
dali.stage.add( actor );
...
-function onPressed( actor, touch
Event
)
+function onPressed( actor, touch )
{
var animOptions = { alpha: "bounce", delay: 0, duration: 15 };
var anim = new dali.Animation();
{
var animOptions = { alpha: "bounce", delay: 0, duration: 15 };
var anim = new dali.Animation();
- anim.animateTo( actor, "position", [ 200,
-100,0
], animOptions );
+ anim.animateTo( actor, "position", [ 200,
-100, 0
], animOptions );
anim.play();
return true; // consume the touch event
}
...
anim.play();
return true; // consume the touch event
}
...
-actor.connect( "touch
ed
", onPressed );
+actor.connect( "touch", onPressed );
~~~
~~~
@@
-76,7
+76,7
@@
actor.connect( "touched", onPressed );
"parentOrigin": "CENTER",
"signals" :
[
"parentOrigin": "CENTER",
"signals" :
[
- { "name" : "touch
ed
", "action": "play", "animation": "move" }
+ { "name" : "touch", "action": "play", "animation": "move" }
]
}
]
]
}
]