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

diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp
index 075238c1..7b60ba80 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  *
@@ -40,7 +40,7 @@ ChatView::ChatView(BufferId bufferId, QWidget *parent)
 {
     QList<BufferId> filterList;
     filterList.append(bufferId);
-    MessageFilter *filter = new MessageFilter(Client::messageModel(), filterList, this);
+    auto *filter = new MessageFilter(Client::messageModel(), filterList, this);
     init(filter);
 }
 
@@ -55,7 +55,7 @@ ChatView::ChatView(MessageFilter *filter, QWidget *parent)
 
 void ChatView::init(MessageFilter *filter)
 {
-    _bufferContainer = 0;
+    _bufferContainer = nullptr;
     _currentScaleFactor = 1;
     _invalidateFilter = false;
 
@@ -94,7 +94,7 @@ void ChatView::init(MessageFilter *filter)
 bool ChatView::event(QEvent *event)
 {
     if (event->type() == QEvent::KeyPress) {
-        QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+        auto *keyEvent = static_cast<QKeyEvent *>(event);
         switch (keyEvent->key()) {
         case Qt::Key_Up:
         case Qt::Key_Down:
@@ -109,24 +109,39 @@ bool ChatView::event(QEvent *event)
         }
     }
 
-    if (event->type() == QEvent::TouchBegin && _lastTouchStart < QDateTime::currentMSecsSinceEpoch() - 1000) { //(slow) double tab = normal behaviour = select text. 1000 ok?
+    if (event->type() == QEvent::TouchBegin && ((QTouchEvent*)event)->device()->type() == QTouchDevice::TouchScreen) {
+        // 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
     if (event->type() == QEvent::TouchEnd || event->type() == QEvent::TouchCancel) {
-#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 (event->type() == QEvent::Wheel || (event->type() == QEvent::TouchBegin && ((QTouchEvent*)event)->device()->type() == QTouchDevice::TouchScreen) || event->type() == QEvent::TouchUpdate) {
         if (!verticalScrollBar()->isVisible()) {
             scene()->requestBacklog();
             return true;
@@ -279,7 +294,7 @@ QSet<ChatLine *> ChatView::visibleChatLines(Qt::ItemSelectionMode mode) const
 {
     QSet<ChatLine *> result;
     foreach(QGraphicsItem *item, items(viewport()->rect().adjusted(-1, -1, 1, 1), mode)) {
-        ChatLine *line = qgraphicsitem_cast<ChatLine *>(item);
+        auto *line = qgraphicsitem_cast<ChatLine *>(item);
         if (line)
             result.insert(line);
     }
@@ -298,11 +313,11 @@ QList<ChatLine *> ChatView::visibleChatLinesSorted(Qt::ItemSelectionMode mode) c
 ChatLine *ChatView::lastVisibleChatLine(bool ignoreDayChange) const
 {
     if (!scene())
-        return 0;
+        return nullptr;
 
     QAbstractItemModel *model = scene()->model();
     if (!model || model->rowCount() == 0)
-        return 0;
+        return nullptr;
 
     int row = -1;
 
@@ -315,7 +330,7 @@ ChatLine *ChatView::lastVisibleChatLine(bool ignoreDayChange) const
     if (row >= 0)
         return scene()->chatLine(row);
 
-    return 0;
+    return nullptr;
 }
 
 
@@ -354,7 +369,7 @@ void ChatView::jumpToMarkerLine(bool requestBacklog)
 void ChatView::addActionsToMenu(QMenu *menu, const QPointF &pos)
 {
     // zoom actions
-    BufferWidget *bw = qobject_cast<BufferWidget *>(bufferContainer());
+    auto *bw = qobject_cast<BufferWidget *>(bufferContainer());
     if (bw) {
         bw->addActionsToMenu(menu, pos);
         menu->addSeparator();