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
/
multi-touch-guide.md
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
(file)
--- 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.
Multi-Touch Events
==================
Touch events are received via signals.
-For C++ API see Dali::Actor::Touch
ed
Signal() 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( "touch
ed
", myCallback ) and actor.connect("hovered", myCallback );
+For JavaScript use actor.connect( "touch", myCallback ) and actor.connect("hovered", myCallback );
### Hit Testing Rules Summary:
### 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.
IF ( TOUCH-SIGNAL-NOT-EMPTY )
{
// Only do the emission if touch signal of actor has connections.
- CONSUMED = TOUCH
ED-SIGNAL( TOUCH-EVENT
)
+ CONSUMED = TOUCH
-SIGNAL( TOUCH-DATA
)
}
IF ( NOT-CONSUMED )
}
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
touch signals are also emitted from the touch-down actor with an "Interrupted" state.
@class MultiTouch
-*
+
*/
*/