X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatview.cpp;h=704b3bea429a90217f5c2fe6ef5c1aefe0abeb77;hb=e1dc333ae055788dd1a2da86ca72aa126c157697;hp=075238c1f14f83ebfd7c876c7d1f7d378d2b9c9a;hpb=29c7d46de1bb0703e51033ddcec34cb785d6f8c6;p=quassel.git

diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp
index 075238c1..704b3bea 100644
--- a/src/qtui/chatview.cpp
+++ b/src/qtui/chatview.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -109,11 +109,17 @@ bool ChatView::event(QEvent *event)
         }
     }
 
-    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
@@ -121,12 +127,33 @@ bool ChatView::event(QEvent *event)
 #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;