X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatview.cpp;h=ed71dd07a2336109fce6053fc72c8725631be96f;hp=6037c98197cd1b809ad3629865502711f25be47a;hb=5a94027ffed6c97b839a6104e2d572a876a995d8;hpb=49f966fd9c04f3aa3149be73bb61b8e1781ce1c2 diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp index 6037c981..ed71dd07 100644 --- a/src/qtui/chatview.cpp +++ b/src/qtui/chatview.cpp @@ -30,7 +30,8 @@ ChatView::ChatView(BufferId bufferId, QWidget *parent) : QGraphicsView(parent), - AbstractChatView() + AbstractChatView(), + _currentScaleFactor(1) { QList filterList; filterList.append(bufferId); @@ -40,7 +41,8 @@ ChatView::ChatView(BufferId bufferId, QWidget *parent) ChatView::ChatView(MessageFilter *filter, QWidget *parent) : QGraphicsView(parent), - AbstractChatView() + AbstractChatView(), + _currentScaleFactor(1) { init(filter); } @@ -50,14 +52,16 @@ void ChatView::init(MessageFilter *filter) { setAlignment(Qt::AlignBottom); setInteractive(true); //setOptimizationFlags(QGraphicsView::DontClipPainter | QGraphicsView::DontAdjustForAntialiasing); - setOptimizationFlags(QGraphicsView::DontAdjustForAntialiasing); + // setOptimizationFlags(QGraphicsView::DontAdjustForAntialiasing); setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate); - setTransformationAnchor(QGraphicsView::NoAnchor); + // setTransformationAnchor(QGraphicsView::NoAnchor); + setTransformationAnchor(QGraphicsView::AnchorViewCenter); _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))); } @@ -65,17 +69,22 @@ 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) { +void ChatView::lastLineChanged(QGraphicsItem *chatLine, qreal offset) { + Q_UNUSED(chatLine) QAbstractSlider *vbar = verticalScrollBar(); Q_ASSERT(vbar); - if(vbar->maximum() - vbar->value() <= chatLine->boundingRect().height() + 5) { // 5px grace area + if(vbar->maximum() - vbar->value() <= (offset + 5) * _currentScaleFactor ) { // 5px grace area vbar->setValue(vbar->maximum()); } } @@ -107,3 +116,21 @@ MsgId ChatView::lastMsgId() const { return model->data(model->index(model->rowCount() - 1, 0), MessageModel::MsgIdRole).value(); } + +void ChatView::zoomIn() { + _currentScaleFactor *= 1.2; + scale(1.2, 1.2); + scene()->setWidth(viewport()->width() / _currentScaleFactor - 2); +} + +void ChatView::zoomOut() { + _currentScaleFactor /= 1.2; + scale(1 / 1.2, 1 / 1.2); + scene()->setWidth(viewport()->width() / _currentScaleFactor - 2); +} + +void ChatView::zoomNormal() { + scale(1/_currentScaleFactor, 1/_currentScaleFactor); + _currentScaleFactor = 1; + scene()->setWidth(viewport()->width() - 2); +}