X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatview.cpp;h=6037c98197cd1b809ad3629865502711f25be47a;hb=71d7e1a6931b5edfa3fd15de5ad82bbca25d1426;hp=02d61b261bf766142fcedb1dca6f06a6b6b467e8;hpb=e920325766f65e66132c20e4cb1da8f8e3f5e030;p=quassel.git

diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp
index 02d61b26..6037c981 100644
--- a/src/qtui/chatview.cpp
+++ b/src/qtui/chatview.cpp
@@ -49,25 +49,34 @@ void ChatView::init(MessageFilter *filter) {
   setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
   setAlignment(Qt::AlignBottom);
   setInteractive(true);
+  //setOptimizationFlags(QGraphicsView::DontClipPainter | QGraphicsView::DontAdjustForAntialiasing);
+  setOptimizationFlags(QGraphicsView::DontAdjustForAntialiasing);
+  setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
+  setTransformationAnchor(QGraphicsView::NoAnchor);
 
-  _scene = new ChatScene(filter, filter->idString(), this);
-  connect(_scene, SIGNAL(heightChangedAt(qreal, qreal)), this, SLOT(sceneHeightChangedAt(qreal, qreal)));
+  _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 *)));
   setScene(_scene);
 
-  _lastScrollbarPos = 0;
   connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(verticalScrollbarChanged(int)));
 }
 
 void ChatView::resizeEvent(QResizeEvent *event) {
-  scene()->setWidth(event->size().width() - 2);  // FIXME figure out why we have to hardcode the -2 here
+  QGraphicsView::resizeEvent(event);
+
+  // FIXME: without the hardcoded -2 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());
+  _lastScrollbarPos = verticalScrollBar()->maximum();
   verticalScrollBar()->setValue(verticalScrollBar()->maximum());
 }
 
-void ChatView::sceneHeightChangedAt(qreal ypos, qreal hdiff) {
-  setSceneRect(scene()->sceneRect());
-  int y = mapFromScene(0, ypos).y();
-  if(y <= viewport()->height() + 2) {  // be a bit tolerant here, also FIXME (why we need the 2px?)
-    verticalScrollBar()->setValue(verticalScrollBar()->value() + hdiff);
+void ChatView::lastLineChanged(QGraphicsItem *chatLine) {
+  QAbstractSlider *vbar = verticalScrollBar();
+  Q_ASSERT(vbar);
+  if(vbar->maximum() - vbar->value() <= chatLine->boundingRect().height() + 5) { // 5px grace area
+    vbar->setValue(vbar->maximum());
   }
 }
 
@@ -75,6 +84,7 @@ void ChatView::verticalScrollbarChanged(int newPos) {
   QAbstractSlider *vbar = verticalScrollBar();
   Q_ASSERT(vbar);
 
+  // check for backlog request
   if(newPos < _lastScrollbarPos) {
     int relativePos = 100;
     if(vbar->maximum() - vbar->minimum() != 0)