X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=docs%2Fcontent%2Fshared-javascript-and-cpp-documentation%2Fmulti-touch-guide.md;h=f870d4b5ccb84e2d675b4cfe9d72083bca60fcff;hp=f3a1df21602ef37a2d1e9fe3325de4e445b78525;hb=f60b3d8e308a5145efe754cbff2a47b4ae278021;hpb=9f9bd6287b64fab61422e8b4a0d61a379c47176c diff --git a/docs/content/shared-javascript-and-cpp-documentation/multi-touch-guide.md b/docs/content/shared-javascript-and-cpp-documentation/multi-touch-guide.md index f3a1df2..f870d4b 100644 --- a/docs/content/shared-javascript-and-cpp-documentation/multi-touch-guide.md +++ b/docs/content/shared-javascript-and-cpp-documentation/multi-touch-guide.md @@ -6,9 +6,9 @@ Multi-Touch Events Touch events are received via signals. -For C++ API see Dali::Actor::TouchedSignal() and Dali::Actor::HoveredSignal() for more details. +For C++ API see Dali::Actor::TouchSignal() and Dali::Actor::HoveredSignal() for more details. -For JavaScript use actor.connect( "touched", myCallback ) and actor.connect("hovered", myCallback ); +For JavaScript use actor.connect( "touch", myCallback ) and actor.connect("hovered", myCallback ); ### Hit Testing Rules Summary: @@ -34,7 +34,7 @@ For JavaScript use actor.connect( "touched", myCallback ) and actor.connect("hov - Actors - The final part of hit testing is performed by walking through the actor tree within a layer. - - The following pseudocode shows the algorithm used: + - The following pseudo-code shows the algorithm used: ~~~ @@ -107,7 +107,7 @@ Hit Priority of above Actor tree (all overlays): 1 - Lowest. 6 - Highest. actor (and its parents). There will be NO touch signal delivery for the hit actors of the other touch points. - The local coordinates are from the top-left (0.0f, 0.0f, 0.5f) of the hit actor. - - The following pseudocode shows the delivery mechanism: + - The following pseudo-code shows the delivery mechanism: ~~~ EMIT-TOUCH-SIGNAL( ACTOR ) @@ -115,7 +115,7 @@ Hit Priority of above Actor tree (all overlays): 1 - Lowest. 6 - Highest. IF ( TOUCH-SIGNAL-NOT-EMPTY ) { // Only do the emission if touch signal of actor has connections. - CONSUMED = TOUCHED-SIGNAL( TOUCH-EVENT ) + CONSUMED = TOUCH-SIGNAL( TOUCH-DATA ) } IF ( NOT-CONSUMED )