X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatview.cpp;h=94f3fb74097ad5a6e2626455645f78696af515be;hp=6b2d1f59b1244a381b5affa27f2cd9992a422973;hb=1e178fffec52593b5ff5b94f5f30dcb43b611034;hpb=176d22d49934223b9279719ac5d9e7c03e530d40

diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp
index 6b2d1f59..94f3fb74 100644
--- a/src/qtui/chatview.cpp
+++ b/src/qtui/chatview.cpp
@@ -47,16 +47,18 @@ ChatView::ChatView(MessageFilter *filter, QWidget *parent)
 
 void ChatView::init(MessageFilter *filter) {
   setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-  // setAlignment(Qt::AlignBottom);
+  setAlignment(Qt::AlignBottom);
   setInteractive(true);
-  setOptimizationFlags(QGraphicsView::DontClipPainter | QGraphicsView::DontAdjustForAntialiasing);
+  //setOptimizationFlags(QGraphicsView::DontClipPainter | QGraphicsView::DontAdjustForAntialiasing);
+  // setOptimizationFlags(QGraphicsView::DontAdjustForAntialiasing);
   setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
   setTransformationAnchor(QGraphicsView::NoAnchor);
 
   _scene = new ChatScene(filter, filter->idString(), viewport()->width() - 2, this); // see below: resizeEvent()
   connect(_scene, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(sceneRectChanged(const QRectF &)));
-  //connect(_scene, SIGNAL(lastLineChanged(QGraphicsItem *)), this, SLOT(lastLineChanged(QGraphicsItem *)));
+  connect(_scene, SIGNAL(lastLineChanged(QGraphicsItem *, qreal)), this, SLOT(lastLineChanged(QGraphicsItem *, qreal)));
   setScene(_scene);
+  // installEventFilter(_scene);
 
   connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(verticalScrollbarChanged(int)));
 }
@@ -64,25 +66,31 @@ void ChatView::init(MessageFilter *filter) {
 void ChatView::resizeEvent(QResizeEvent *event) {
   QGraphicsView::resizeEvent(event);
 
-  // FIXME: without the hardcoded -2 Qt reserves space for a horizontal scrollbar even though it's disabled permanently.
+  // we can reduce viewport updates if we scroll to the bottom allready at the beginning
+  verticalScrollBar()->setValue(verticalScrollBar()->maximum());
+
+  // FIXME: without the hardcoded -4 Qt reserves space for a horizontal scrollbar even though it's disabled permanently.
   // this does only occur on QtX11 (at least not on Qt for Mac OS). Seems like a Qt Bug.
-  scene()->updateForViewport(viewport()->width() - 2, viewport()->height());
+  scene()->updateForViewport(viewport()->width() - 4, viewport()->height());
+
   _lastScrollbarPos = verticalScrollBar()->maximum();
   verticalScrollBar()->setValue(verticalScrollBar()->maximum());
 }
 
-void ChatView::lastLineChanged(QGraphicsItem *chatLine) {
-  // FIXME: if vbar offset < chatline height -> centerOn(chatLine);
-  centerOn(chatLine);
+void ChatView::lastLineChanged(QGraphicsItem *chatLine, qreal offset) {
+  Q_UNUSED(chatLine)
+  QAbstractSlider *vbar = verticalScrollBar();
+  Q_ASSERT(vbar);
+  if(vbar->maximum() - vbar->value() <= offset + 5) { // 5px grace area
+    vbar->setValue(vbar->maximum());
+  }
 }
 
 void ChatView::verticalScrollbarChanged(int newPos) {
   QAbstractSlider *vbar = verticalScrollBar();
   Q_ASSERT(vbar);
 
-  if(vbar->maximum() - vbar->value() <= 5) // FIXME workaround the fact that the view gets scrolled up a few px on buffer change
-    vbar->setValue(vbar->maximum());
-
+  // check for backlog request
   if(newPos < _lastScrollbarPos) {
     int relativePos = 100;
     if(vbar->maximum() - vbar->minimum() != 0)