diff options
Diffstat (limited to 'testapp')
| -rw-r--r-- | testapp/main.cpp | 2 | ||||
| -rw-r--r-- | testapp/qscrollareakineticscroller.cpp | 45 | ||||
| -rw-r--r-- | testapp/testapp.pro | 2 |
3 files changed, 17 insertions, 32 deletions
diff --git a/testapp/main.cpp b/testapp/main.cpp index c08c745..4240979 100644 --- a/testapp/main.cpp +++ b/testapp/main.cpp @@ -129,12 +129,10 @@ private: if (QAbstractScrollArea *area = qobject_cast<QAbstractScrollArea *>(w)) { QScrollAreaKineticScroller *newScroller = new QScrollAreaKineticScroller(); newScroller->setWidget(area); - w->setProperty("kineticScroller", QVariant::fromValue(static_cast<QKineticScroller*>(newScroller)) ); return newScroller; } else if (QWebView *web = qobject_cast<QWebView *>(w)) { QWebViewKineticScroller *newScroller = new QWebViewKineticScroller(); newScroller->setWidget(web); - w->setProperty("kineticScroller", QVariant::fromValue(static_cast<QKineticScroller*>(newScroller)) ); return newScroller; } else { return 0; diff --git a/testapp/qscrollareakineticscroller.cpp b/testapp/qscrollareakineticscroller.cpp index 43fb8dd..dbe20dc 100644 --- a/testapp/qscrollareakineticscroller.cpp +++ b/testapp/qscrollareakineticscroller.cpp @@ -40,8 +40,6 @@ ****************************************************************************/ #include <qscrollareakineticscroller.h> -#include <qflickgesture.h> - #include <QApplication> #include <QGraphicsView> #include <QAbstractScrollArea> @@ -141,13 +139,9 @@ void QScrollAreaKineticScroller::setWidget(QAbstractScrollArea *widget) { Q_D(QScrollAreaKineticScroller); - static Qt::GestureType gestureType = (Qt::GestureType)0; - if (d->area) { d->area->viewport()->removeEventFilter(this); d->area->viewport()->move(d->area->viewport()->pos() + d->lastOvershoot); - - d->area->ungrabGesture(gestureType); d->area->viewport()->setAttribute(Qt::WA_AcceptTouchEvents, false); } @@ -158,17 +152,7 @@ void QScrollAreaKineticScroller::setWidget(QAbstractScrollArea *widget) setParent(d->area); if (d->area) { - - // need to register the gesture type - if( !gestureType ) { - gestureType = QGestureRecognizer::registerRecognizer( new QFlickGestureRecognizer() ); - } - - d->area->viewport()->grabGesture(gestureType); - - /* d->area->viewport()->setAttribute(Qt::WA_AcceptTouchEvents, true); - */ d->area->viewport()->installEventFilter(this); if (QAbstractItemView *view = qobject_cast<QAbstractItemView *>(d->area)) { view->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel); @@ -190,21 +174,30 @@ bool QScrollAreaKineticScroller::eventFilter(QObject *o, QEvent *e) if (d->area && (o == d->area->viewport()) && !d->ignoreEvents && d->area->isEnabled() && isEnabled()) { switch (e->type()) { - case QEvent::Gesture: - qDebug("Got gesture event"); - res = true; - break; case QEvent::TouchBegin: case QEvent::TouchUpdate: case QEvent::TouchEnd: { - res = true; + Input type = (e->type() == QEvent::TouchBegin) ? InputPress : + ((e->type() == QEvent::TouchEnd) ? InputRelease : InputMove); + QTouchEvent *te = static_cast<QTouchEvent *>(e); + int idx = (te->deviceType() == QTouchEvent::TouchScreen) ? 0 : 1; + + if (te->touchPoints().count() == (idx + 1)) { + res = handleInput(type, te->touchPoints().at(idx).pos() - d->lastOvershoot, timestamp); + if (type == InputPress) { + d->touchActive = true; + e->accept(); + } else if (type == InputRelease) { + d->touchActive = false; + } + } + break; } case QEvent::Wheel: // the two-finger gesture on the Mac is mapped to wheel events by default res = d->touchActive; break; -#if 0 case QEvent::MouseButtonPress: // re-install the event filter so that we get the mouse release before all other filters. // this is an evil hack, but hard to work around without prioritized event filters. @@ -219,19 +212,13 @@ bool QScrollAreaKineticScroller::eventFilter(QObject *o, QEvent *e) case QEvent::MouseMove: case QEvent::MouseButtonRelease: if (!d->touchActive) { - res = !((state() == QKineticScroller::StateInactive) || - (state() == QKineticScroller::StatePressed)); - /* Input type = (e->type() == QEvent::MouseButtonRelease) ? InputRelease : ((e->type() == QEvent::MouseMove) ? InputMove : InputPress); QMouseEvent *me = static_cast<QMouseEvent *>(e); isMouseEvent = true; - // res = handleInput(type, me->posF() - d->lastOvershoot, timestamp); - res = true; - */ + res = handleInput(type, me->posF() - d->lastOvershoot, timestamp); } break; -#endif case QEvent::ChildAdded: case QEvent::ChildRemoved: { diff --git a/testapp/testapp.pro b/testapp/testapp.pro index 8f9d20a..35f72a9 100644 --- a/testapp/testapp.pro +++ b/testapp/testapp.pro @@ -12,7 +12,7 @@ LIBS += -L../scroller -lscroller unix:PRE_TARGETDEPS += ../scroller/libscroller.a win32:PRE_TARGETDEPS += ../scroller/scroller.lib -QT += webkit network +QT += webkit # Input HEADERS += plotwidget.h qscrollareakineticscroller.h qwebviewkineticscroller.h settingswidget.h |