MCL/sf/mw/qt: comparison src/gui/kernel/qmacgesturerecognizer

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 QMacSwipeGestureRecognizer::QMacSwipeGestureRecognizer()
 {
 }
-QGesture *QMacSwipeGestureRecognizer::createGesture(QObject * /*target*/)
+QGesture *QMacSwipeGestureRecognizer::create(QObject * /*target*/)
 {
 return new QSwipeGesture;
 }
 QGestureRecognizer::Result
-QMacSwipeGestureRecognizer::filterEvent(QGesture *gesture, QObject *obj, QEvent *event)
+QMacSwipeGestureRecognizer::recognize(QGesture *gesture, QObject *obj, QEvent *event)
 {
 if (event->type() == QEvent::NativeGesture && obj->isWidgetType()) {
 QNativeGestureEvent *ev = static_cast<QNativeGestureEvent*>(event);
 switch (ev->gestureType) {
 case QNativeGestureEvent::Swipe: {
 QSwipeGesture *g = static_cast<QSwipeGesture *>(gesture);
 g->setSwipeAngle(ev->angle);
-return QGestureRecognizer::GestureTriggered | QGestureRecognizer::ConsumeEventHint;
+return QGestureRecognizer::FinishGesture | QGestureRecognizer::ConsumeEventHint;
 break; }
 default:
 break;
 }
 }
 QMacPinchGestureRecognizer::QMacPinchGestureRecognizer()
 {
 }
-QGesture *QMacPinchGestureRecognizer::createGesture(QObject * /*target*/)
+QGesture *QMacPinchGestureRecognizer::create(QObject * /*target*/)
 {
 return new QPinchGesture;
 }
 QGestureRecognizer::Result
-QMacPinchGestureRecognizer::filterEvent(QGesture *gesture, QObject *obj, QEvent *event)
+QMacPinchGestureRecognizer::recognize(QGesture *gesture, QObject *obj, QEvent *event)
 {
 if (event->type() == QEvent::NativeGesture && obj->isWidgetType()) {
 QPinchGesture *g = static_cast<QPinchGesture *>(gesture);
 QNativeGestureEvent *ev = static_cast<QNativeGestureEvent*>(event);
 switch(ev->gestureType) {
 case QNativeGestureEvent::GestureBegin:
 reset(gesture);
 g->setStartCenterPoint(static_cast<QWidget*>(obj)->mapFromGlobal(ev->position));
 g->setCenterPoint(g->startCenterPoint());
-g->setWhatChanged(QPinchGesture::CenterPointChanged);
+g->setChangeFlags(QPinchGesture::CenterPointChanged);
-return QGestureRecognizer::MaybeGesture | QGestureRecognizer::ConsumeEventHint;
+g->setTotalChangeFlags(g->totalChangeFlags() | g->changeFlags());
+return QGestureRecognizer::MayBeGesture | QGestureRecognizer::ConsumeEventHint;
 case QNativeGestureEvent::Rotate: {
 g->setLastScaleFactor(g->scaleFactor());
 g->setLastRotationAngle(g->rotationAngle());
 g->setRotationAngle(g->rotationAngle() + ev->percentage);
-g->setWhatChanged(QPinchGesture::RotationAngleChanged);
+g->setChangeFlags(QPinchGesture::RotationAngleChanged);
-return QGestureRecognizer::GestureTriggered | QGestureRecognizer::ConsumeEventHint;
+g->setTotalChangeFlags(g->totalChangeFlags() | g->changeFlags());
-break;
+return QGestureRecognizer::TriggerGesture | QGestureRecognizer::ConsumeEventHint;
 }
 case QNativeGestureEvent::Zoom:
 g->setLastScaleFactor(g->scaleFactor());
 g->setLastRotationAngle(g->rotationAngle());
-g->setScaleFactor(g->scaleFactor() + ev->percentage);
+g->setScaleFactor(g->scaleFactor() * (1 + ev->percentage));
-g->setWhatChanged(QPinchGesture::ScaleFactorChanged);
+g->setChangeFlags(QPinchGesture::ScaleFactorChanged);
-return QGestureRecognizer::GestureTriggered | QGestureRecognizer::ConsumeEventHint;
+g->setTotalChangeFlags(g->totalChangeFlags() | g->changeFlags());
-break;
+return QGestureRecognizer::TriggerGesture | QGestureRecognizer::ConsumeEventHint;
 case QNativeGestureEvent::GestureEnd:
-return QGestureRecognizer::GestureFinished | QGestureRecognizer::ConsumeEventHint;
+return QGestureRecognizer::FinishGesture | QGestureRecognizer::ConsumeEventHint;
-break;
 default:
 break;
 }
 }
 }
 void QMacPinchGestureRecognizer::reset(QGesture *gesture)
 {
 QPinchGesture *g = static_cast<QPinchGesture *>(gesture);
-g->setWhatChanged(0);
+g->setChangeFlags(0);
+g->setTotalChangeFlags(0);
 g->setScaleFactor(1.0f);
 g->setTotalScaleFactor(1.0f);
 g->setLastScaleFactor(1.0f);
 g->setRotationAngle(0.0f);
 g->setTotalRotationAngle(0.0f);
 QMacPanGestureRecognizer::QMacPanGestureRecognizer() : _panCanceled(true)
 {
 }
-QGesture *QMacPanGestureRecognizer::createGesture(QObject *target)
+QGesture *QMacPanGestureRecognizer::create(QObject *target)
 {
 if (!target)
 return new QPanGesture;
 if (QWidget *w = qobject_cast<QWidget *>(target)) {
 }
 return 0;
 }
 QGestureRecognizer::Result
-QMacPanGestureRecognizer::filterEvent(QGesture *gesture, QObject *target, QEvent *event)
+QMacPanGestureRecognizer::recognize(QGesture *gesture, QObject *target, QEvent *event)
 {
 const int panBeginDelay = 300;
 const int panBeginRadius = 3;
 QPanGesture *g = static_cast<QPanGesture *>(gesture);
 case QEvent::TouchBegin: {
 const QTouchEvent *ev = static_cast<const QTouchEvent*>(event);
 if (ev->touchPoints().size() == 1) {
 reset(gesture);
 _startPos = QCursor::pos();
-_lastPos = _startPos;
 _panTimer.start(panBeginDelay, target);
 _panCanceled = false;
-return QGestureRecognizer::MaybeGesture;
+return QGestureRecognizer::MayBeGesture;
 }
 break;}
 case QEvent::TouchEnd: {
 if (_panCanceled)
 break;
 const QTouchEvent *ev = static_cast<const QTouchEvent*>(event);
 if (ev->touchPoints().size() == 1)
-return QGestureRecognizer::GestureFinished;
+return QGestureRecognizer::FinishGesture;
 break;}
 case QEvent::TouchUpdate: {
 if (_panCanceled)
 break;
 // moved his finger so much that it makes sense to cancel the pan:
 const QPointF p = QCursor::pos();
 if ((p - _startPos).manhattanLength() > panBeginRadius) {
 _panCanceled = true;
 _panTimer.stop();
-return QGestureRecognizer::NotGesture;
+return QGestureRecognizer::CancelGesture;
 }
 } else {
 const QPointF p = QCursor::pos();
-const QPointF posOffset = p - _lastPos;
+const QPointF posOffset = p - _startPos;
 g->setLastOffset(g->offset());
 g->setOffset(QPointF(posOffset.x(), posOffset.y()));
-g->setTotalOffset(g->lastOffset() + g->offset());
+return QGestureRecognizer::TriggerGesture;
-_lastPos = p;
-return QGestureRecognizer::GestureTriggered;
 }
 } else if (_panTimer.isActive()) {
 // I only want to cancel the pan if the user is pressing
 // more than one finger, and the pan hasn't started yet:
 _panCanceled = true;
 _panTimer.stop();
-return QGestureRecognizer::NotGesture;
+return QGestureRecognizer::CancelGesture;
 }
 break;}
 case QEvent::Timer: {
 QTimerEvent *ev = static_cast<QTimerEvent *>(event);
 if (ev->timerId() == _panTimer.timerId()) {
 _panTimer.stop();
 if (_panCanceled)
 break;
 // Begin new pan session!
 _startPos = QCursor::pos();
-_lastPos = _startPos;
+return QGestureRecognizer::TriggerGesture | QGestureRecognizer::ConsumeEventHint;
-return QGestureRecognizer::GestureTriggered | QGestureRecognizer::ConsumeEventHint;
 }
 break; }
 default:
 break;
 }
 void QMacPanGestureRecognizer::reset(QGesture *gesture)
 {
 QPanGesture *g = static_cast<QPanGesture *>(gesture);
 _startPos = QPointF();
-_lastPos = QPointF();
 _panCanceled = true;
 g->setOffset(QPointF(0, 0));
 g->setLastOffset(QPointF(0, 0));
-g->setTotalOffset(QPointF(0, 0));
 g->setAcceleration(qreal(1));
 QGestureRecognizer::reset(gesture);
 }
 #endif // QT_MAC_USE_COCOA

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7