diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-08-27 11:32:39 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-08-27 12:06:14 (GMT) |
| commit | a69f291170b38166acceef7c93f3b2d6d55c90d1 (patch) | |
| tree | c8843c2a62fc123e86fdf8b3d06f59a6a9f6b701 /src/gui | |
| parent | 42b1e49335377175b73a499236a800fca40a1d3e (diff) | |
| download | Qt-a69f291170b38166acceef7c93f3b2d6d55c90d1.zip Qt-a69f291170b38166acceef7c93f3b2d6d55c90d1.tar.gz Qt-a69f291170b38166acceef7c93f3b2d6d55c90d1.tar.bz2 | |
Mac: Fix Imageviewer example, and bugfix gestures
Rev-By: denis
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qstandardgestures.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index 5ab7ed2..df50e55 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -892,7 +892,7 @@ extern "C" { qNGEvent.gestureType = QNativeGestureEvent::Rotate; NSPoint p = [[event window] convertBaseToScreen:[event locationInWindow]]; qNGEvent.position = flipPoint(p).toPoint(); - qNGEvent.percentage = [event rotation]; + qNGEvent.percentage = -[event rotation]; qt_sendSpontaneousEvent(qwidget, &qNGEvent); } diff --git a/src/gui/kernel/qstandardgestures.cpp b/src/gui/kernel/qstandardgestures.cpp index 0bd8133..780c41f 100644 --- a/src/gui/kernel/qstandardgestures.cpp +++ b/src/gui/kernel/qstandardgestures.cpp @@ -373,6 +373,7 @@ bool QPinchGesture::eventFilter(QObject *receiver, QEvent *event) #endif return false; case QNativeGestureEvent::Rotate: + d->scaleFactor = 0; d->lastRotationAngle = d->rotationAngle; #if defined(Q_WS_WIN) d->rotationAngle = -1 * GID_ROTATE_ANGLE_FROM_ARGUMENT(ev->argument); @@ -383,6 +384,7 @@ bool QPinchGesture::eventFilter(QObject *receiver, QEvent *event) event->accept(); break; case QNativeGestureEvent::Zoom: + d->rotationAngle = 0; #if defined(Q_WS_WIN) if (d->initialDistance != 0) { d->lastScaleFactor = d->scaleFactor; diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 53d1b6e..192ae6b 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -1064,7 +1064,7 @@ OSStatus QWidgetPrivate::qt_window_event(EventHandlerCallRef er, EventRef event, break; } qNGEvent.gestureType = QNativeGestureEvent::Rotate; - qNGEvent.percentage = float(amount); + qNGEvent.percentage = float(-amount); break; } case kEventGestureSwipe: { HIPoint swipeDirection; |