diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-27 17:17:43 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-27 17:17:43 (GMT) |
| commit | 81fc91183fd12cff512ac20ed265b6c0b44b2f30 (patch) | |
| tree | cee6735f83fadc0a10d999a8baacf441da302069 /src/gui/kernel/qcocoaview_mac.mm | |
| parent | 34d66c954e85fddd50d3a8712e0e8dc985d3414c (diff) | |
| parent | 1241aa609bb1621e6377920219b6d18a1203e50a (diff) | |
| download | Qt-81fc91183fd12cff512ac20ed265b6c0b44b2f30.zip Qt-81fc91183fd12cff512ac20ed265b6c0b44b2f30.tar.gz Qt-81fc91183fd12cff512ac20ed265b6c0b44b2f30.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/kernel/qcocoaview_mac.mm')
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index df50e55..0a45ce9 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -905,7 +905,14 @@ extern "C" { qNGEvent.gestureType = QNativeGestureEvent::Swipe; NSPoint p = [[event window] convertBaseToScreen:[event locationInWindow]]; qNGEvent.position = flipPoint(p).toPoint(); - qNGEvent.direction = QSize(-[event deltaX], -[event deltaY]); + if ([event deltaX] == 1) + qNGEvent.angle = 180.0f; + else if ([event deltaX] == -1) + qNGEvent.angle = 0.0f; + else if ([event deltaY] == 1) + qNGEvent.angle = 90.0f; + else if ([event deltaY] == -1) + qNGEvent.angle = 270.0f; qt_sendSpontaneousEvent(qwidget, &qNGEvent); } |