From f091c08e33f4cc2ed63afebab0ae90f2dad55139 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Mon, 22 Sep 2008 12:24:26 +0200 Subject: [PATCH 1/1] fixing speed up aftermath --- src/qtui/chatview.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp index 6b2d1f59..fe196d06 100644 --- a/src/qtui/chatview.cpp +++ b/src/qtui/chatview.cpp @@ -47,7 +47,7 @@ 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); setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate); @@ -55,7 +55,7 @@ void ChatView::init(MessageFilter *filter) { _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 *)), this, SLOT(lastLineChanged(QGraphicsItem *))); setScene(_scene); connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(verticalScrollbarChanged(int))); @@ -72,17 +72,18 @@ void ChatView::resizeEvent(QResizeEvent *event) { } void ChatView::lastLineChanged(QGraphicsItem *chatLine) { - // FIXME: if vbar offset < chatline height -> centerOn(chatLine); - centerOn(chatLine); + QAbstractSlider *vbar = verticalScrollBar(); + Q_ASSERT(vbar); + 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); - 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) -- 2.20.1