}
}
- if (event->type() == QEvent::TouchBegin && _lastTouchStart < QDateTime::currentMSecsSinceEpoch() - 1000) { //(slow) double tab = normal behaviour = select text. 1000 ok?
+#if QT_VERSION >= 0x050000
+ if (event->type() == QEvent::TouchBegin && ((QTouchEvent*)event)->device()->type()==QTouchDevice::TouchScreen) {
+#else
+ if (event->type() == QEvent::TouchBegin && ((QTouchEvent*)event)->deviceType()==QTouchEvent::TouchScreen) {
+#endif
+ // Enable scrolling by draging, disable selecting/clicking content
setDragMode(QGraphicsView::ScrollHandDrag);
setInteractive(false);
- _lastTouchStart = QDateTime::currentMSecsSinceEpoch();
- if (verticalScrollBar()->isVisible()) return true; //if scrollbar is not visible we need to request backlog below
+ // if scrollbar is not visible we need to request backlog below else we need to accept
+ // the event now (return true) so that we will receive TouchUpdate and TouchEnd/TouchCancel
+ if (verticalScrollBar()->isVisible()) return true;
}
#if QT_VERSION >= 0x050000
#else
if (event->type() == QEvent::TouchEnd) {
#endif
+ // End scroll and reset settings to default
setDragMode(QGraphicsView::NoDrag);
setInteractive(true);
+ _firstTouchUpdateHappened = false;
return true;
}
- if (event->type() == QEvent::Wheel || event->type() == QEvent::TouchBegin || event->type() == QEvent::TouchUpdate) {
+ if (event->type() == QEvent::TouchUpdate) {
+ if (!_firstTouchUpdateHappened) {
+ // After the first movement of a Touch-Point, calculate the distance in both axis
+ // and if the point moved more horizontally abort scroll.
+ QTouchEvent::TouchPoint p = ((QTouchEvent*)event)->touchPoints().at(0);
+ double dx = qAbs(p.lastPos().x() - p.pos().x());
+ double dy = qAbs(p.lastPos().y() - p.pos().y());
+ if (dx > dy) {
+ setDragMode(QGraphicsView::NoDrag);
+ setInteractive(true);
+ }
+ _firstTouchUpdateHappened = true;
+ }
+ // Applying the movement happens automatically by the drag-mode
+ }
+#if QT_VERSION >= 0x050000
+ if (event->type() == QEvent::Wheel || (event->type() == QEvent::TouchBegin && ((QTouchEvent*)event)->device()->type()==QTouchDevice::TouchScreen) || event->type() == QEvent::TouchUpdate) {
+#else
+ if (event->type() == QEvent::Wheel || (event->type() == QEvent::TouchBegin && ((QTouchEvent*)event)->deviceType()==QTouchEvent::TouchScreen) || event->type() == QEvent::TouchUpdate) {
+#endif
if (!verticalScrollBar()->isVisible()) {
scene()->requestBacklog();
return true;