X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatview.cpp;h=14f508ecb25aba63121d724c3e2a027f8aeacf42;hp=fd31645f64be711ffc13f00d17127857da1f4aa8;hb=22b225ba81373362e6d02a88cd3a906e8c394aac;hpb=20f221fe0c23d6eee52506072aead8b0d547334d

diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp
index fd31645f..14f508ec 100644
--- a/src/qtui/chatview.cpp
+++ b/src/qtui/chatview.cpp
@@ -18,10 +18,11 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <QApplication>
 #include <QGraphicsTextItem>
+#include <QMenu>
 #include <QScrollBar>
 
+#include "bufferwidget.h"
 #include "chatlinemodelitem.h"
 #include "chatscene.h"
 #include "chatview.h"
@@ -32,6 +33,7 @@
 ChatView::ChatView(BufferId bufferId, QWidget *parent)
   : QGraphicsView(parent),
     AbstractChatView(),
+    _bufferContainer(0),
     _currentScaleFactor(1)
 {
   QList<BufferId> filterList;
@@ -43,6 +45,7 @@ ChatView::ChatView(BufferId bufferId, QWidget *parent)
 ChatView::ChatView(MessageFilter *filter, QWidget *parent)
   : QGraphicsView(parent),
     AbstractChatView(),
+    _bufferContainer(0),
     _currentScaleFactor(1)
 {
   init(filter);
@@ -58,15 +61,46 @@ void ChatView::init(MessageFilter *filter) {
   // setTransformationAnchor(QGraphicsView::NoAnchor);
   setTransformationAnchor(QGraphicsView::AnchorViewCenter);
 
-  _scene = new ChatScene(filter, filter->idString(), viewport()->width() - 2, this); // see below: resizeEvent()
+  _scrollTimer.setInterval(100);
+  _scrollTimer.setSingleShot(true);
+  connect(&_scrollTimer, SIGNAL(timeout()), SLOT(scrollTimerTimeout()));
+
+  _scene = new ChatScene(filter, filter->idString(), viewport()->width() - 4, this); // see below: resizeEvent()
   connect(_scene, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(sceneRectChanged(const QRectF &)));
   connect(_scene, SIGNAL(lastLineChanged(QGraphicsItem *, qreal)), this, SLOT(lastLineChanged(QGraphicsItem *, qreal)));
+  connect(_scene, SIGNAL(mouseMoveWhileSelecting(const QPointF &)), this, SLOT(mouseMoveWhileSelecting(const QPointF &)));
   setScene(_scene);
-  // installEventFilter(_scene);
 
   connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(verticalScrollbarChanged(int)));
 }
 
+bool ChatView::event(QEvent *event) {
+  if(event->type() == QEvent::KeyPress) {
+    QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
+    switch(keyEvent->key()) {
+    case Qt::Key_Up:
+    case Qt::Key_Down:
+    case Qt::Key_PageUp:
+    case Qt::Key_PageDown:
+      if(!verticalScrollBar()->isVisible()) {
+	scene()->requestBacklog();
+	return true;
+      }
+    default:
+      break;
+    }
+  }
+
+  if(event->type() == QEvent::Wheel) {
+    if(!verticalScrollBar()->isVisible()) {
+      scene()->requestBacklog();
+      return true;
+    }
+  }
+
+  return QGraphicsView::event(event);
+}
+
 void ChatView::resizeEvent(QResizeEvent *event) {
   QGraphicsView::resizeEvent(event);
 
@@ -81,12 +115,36 @@ void ChatView::resizeEvent(QResizeEvent *event) {
   verticalScrollBar()->setValue(verticalScrollBar()->maximum());
 }
 
+void ChatView::mouseMoveWhileSelecting(const QPointF &scenePos) {
+  int y = (int)mapFromScene(scenePos).y();
+  _scrollOffset = 0;
+  if(y < 0)
+    _scrollOffset = y;
+  else if(y > height())
+    _scrollOffset = y - height();
+
+  if(_scrollOffset && !_scrollTimer.isActive())
+    _scrollTimer.start();
+}
+
+void ChatView::scrollTimerTimeout() {
+  // scroll view
+  QAbstractSlider *vbar = verticalScrollBar();
+  if(_scrollOffset < 0 && vbar->value() > 0)
+    vbar->setValue(qMax(vbar->value() + _scrollOffset, 0));
+  else if(_scrollOffset > 0 && vbar->value() < vbar->maximum())
+    vbar->setValue(qMin(vbar->value() + _scrollOffset, vbar->maximum()));
+}
+
 void ChatView::lastLineChanged(QGraphicsItem *chatLine, qreal offset) {
   Q_UNUSED(chatLine)
+  // disabled until further testing/discussion
+  //if(!scene()->isScrollingAllowed())
+  //  return;
+
   QAbstractSlider *vbar = verticalScrollBar();
   Q_ASSERT(vbar);
-  if(QApplication::mouseButtons() == Qt::NoButton
-  && vbar->maximum() - vbar->value() <= (offset + 5) * _currentScaleFactor ) { // 5px grace area
+  if(vbar->maximum() - vbar->value() <= (offset + 5) * _currentScaleFactor ) { // 5px grace area
     vbar->setValue(vbar->maximum());
   }
 }
@@ -119,6 +177,15 @@ MsgId ChatView::lastMsgId() const {
   return model->data(model->index(model->rowCount() - 1, 0), MessageModel::MsgIdRole).value<MsgId>();
 }
 
+void ChatView::addActionsToMenu(QMenu *menu, const QPointF &pos) {
+  // zoom actions
+  BufferWidget *bw = qobject_cast<BufferWidget *>(bufferContainer());
+  if(bw) {
+    bw->addActionsToMenu(menu, pos);
+    menu->addSeparator();
+  }
+}
+
 void ChatView::zoomIn() {
     _currentScaleFactor *= 1.2;
     scale(1.2, 1.2);
@@ -131,7 +198,7 @@ void ChatView::zoomOut() {
     scene()->setWidth(viewport()->width() / _currentScaleFactor - 2);
 }
 
-void ChatView::zoomNormal() {
+void ChatView::zoomOriginal() {
     scale(1/_currentScaleFactor, 1/_currentScaleFactor);
     _currentScaleFactor = 1;
     scene()->setWidth(viewport()->width() - 2);