X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatview.cpp;h=fe196d06c63e1eb1b39abb64a20095778295fe0b;hp=ce79b65ddd844f26fb5780c4df7c2654e27566da;hb=f091c08e33f4cc2ed63afebab0ae90f2dad55139;hpb=e2689c4568c0dcd83f74c1095623cb3fa702204f diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp index ce79b65d..fe196d06 100644 --- a/src/qtui/chatview.cpp +++ b/src/qtui/chatview.cpp @@ -49,32 +49,41 @@ void ChatView::init(MessageFilter *filter) { setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setAlignment(Qt::AlignBottom); setInteractive(true); + setOptimizationFlags(QGraphicsView::DontClipPainter | QGraphicsView::DontAdjustForAntialiasing); + setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate); + setTransformationAnchor(QGraphicsView::NoAnchor); - _scene = new ChatScene(filter, filter->idString(), viewport()->width(), this); - connect(_scene, SIGNAL(sceneHeightChanged(qreal)), this, SLOT(sceneHeightChanged(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 = verticalScrollBar()->maximum(); connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(verticalScrollbarChanged(int))); } void ChatView::resizeEvent(QResizeEvent *event) { QGraphicsView::resizeEvent(event); - scene()->setWidth(viewport()->width() - 2); // FIXME figure out why we have to hardcode the -2 here -> Qt-Bug most probably + + // 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::sceneHeightChanged(qreal dh) { +void ChatView::lastLineChanged(QGraphicsItem *chatLine) { QAbstractSlider *vbar = verticalScrollBar(); Q_ASSERT(vbar); - if(vbar->maximum() - vbar->value() <= dh + 5) // in case we had scrolled only about half a line to the bottom we allow a grace of 5 + if(vbar->maximum() - vbar->value() <= chatLine->boundingRect().height() + 5) { // 5px grace area vbar->setValue(vbar->maximum()); + } } 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)