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=d58019fa6873a893c5ba1ceeec59b8033e1592fe;hp=ba1fc6d415b10b67f37ceee504252c8b57df5877;hb=acbf7e2c17c1578c7125fa07c7eaabe1fe214406;hpb=928136dbb9e23970f3894eabc7c8b224003b77be 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 ba1fc6d..d58019f 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 @@ -1,14 +1,14 @@ -/** - * + 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: @@ -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 ) @@ -144,5 +144,5 @@ Hit Priority of above Actor tree (all overlays): 1 - Lowest. 6 - Highest. touch signals are also emitted from the touch-down actor with an "Interrupted" state. @class MultiTouch -* + */