X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatview.cpp;h=5f89e11c9ad0853082fb931f95ae8fc25b44b2bf;hb=d04e108c6bf0405c4a4855d3c4d2df7beb817b40;hp=ebd81b84b9934615cd2b11c50184831d2cafd176;hpb=5b686746c880e5cda6d5de3e08180ea4332ff222;p=quassel.git

diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp
index ebd81b84..5f89e11c 100644
--- a/src/qtui/chatview.cpp
+++ b/src/qtui/chatview.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 by the Quassel Project                        *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -59,6 +59,7 @@ void ChatView::init(MessageFilter *filter)
     _currentScaleFactor = 1;
     _invalidateFilter = false;
 
+    setAttribute(Qt::WA_AcceptTouchEvents);
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     setAlignment(Qt::AlignLeft|Qt::AlignBottom);
@@ -80,7 +81,7 @@ void ChatView::init(MessageFilter *filter)
     setScene(_scene);
 
     connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(verticalScrollbarChanged(int)));
-    _lastScrollbarPos = verticalScrollBar()->value();
+    _lastScrollbarPos = verticalScrollBar()->maximum();
 
     connect(Client::networkModel(), SIGNAL(markerLineSet(BufferId, MsgId)), SLOT(markerLineSet(BufferId, MsgId)));
 
@@ -108,7 +109,24 @@ bool ChatView::event(QEvent *event)
         }
     }
 
-    if (event->type() == QEvent::Wheel) {
+    if (event->type() == QEvent::TouchBegin && _lastTouchStart < QDateTime::currentMSecsSinceEpoch() - 1000) { //(slow) double tab = normal behaviour = select text. 1000 ok?
+        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 QT_VERSION >= 0x050000
+    if (event->type() == QEvent::TouchEnd || event->type() == QEvent::TouchCancel) {
+#else
+    if (event->type() == QEvent::TouchEnd) {
+#endif
+        setDragMode(QGraphicsView::NoDrag);
+        setInteractive(true);
+        return true;
+    }
+
+    if (event->type() == QEvent::Wheel || event->type() == QEvent::TouchBegin || event->type() == QEvent::TouchUpdate) {
         if (!verticalScrollBar()->isVisible()) {
             scene()->requestBacklog();
             return true;
@@ -126,18 +144,26 @@ bool ChatView::event(QEvent *event)
 
 void ChatView::resizeEvent(QResizeEvent *event)
 {
+    // if view is currently scrolled to bottom, we want it that way after resizing
+    bool atBottom = (_lastScrollbarPos == verticalScrollBar()->maximum());
+
     QGraphicsView::resizeEvent(event);
 
-    // FIXME: do we really need to scroll down on resize?
+    // if scrolling to bottom, do it immediately.
+    if(atBottom)
+    {
+        // we can reduce viewport updates if we scroll to the bottom allready at the beginning
+        verticalScrollBar()->setValue(verticalScrollBar()->maximum());
+    }
 
-    // we can reduce viewport updates if we scroll to the bottom allready at the beginning
-    verticalScrollBar()->setValue(verticalScrollBar()->maximum());
     scene()->updateForViewport(viewport()->width(), viewport()->height());
     adjustSceneRect();
 
-    _lastScrollbarPos = verticalScrollBar()->maximum();
-    verticalScrollBar()->setValue(verticalScrollBar()->maximum());
-
+    if(atBottom)
+    {
+        _lastScrollbarPos = verticalScrollBar()->maximum();
+        verticalScrollBar()->setValue(verticalScrollBar()->maximum());
+    }
     checkChatLineCaches();
 }