X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatview.cpp;h=14f508ecb25aba63121d724c3e2a027f8aeacf42;hp=6b2d1f59b1244a381b5affa27f2cd9992a422973;hb=22b225ba81373362e6d02a88cd3a906e8c394aac;hpb=176d22d49934223b9279719ac5d9e7c03e530d40 diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp index 6b2d1f59..14f508ec 100644 --- a/src/qtui/chatview.cpp +++ b/src/qtui/chatview.cpp @@ -19,8 +19,10 @@ ***************************************************************************/ #include +#include #include +#include "bufferwidget.h" #include "chatlinemodelitem.h" #include "chatscene.h" #include "chatview.h" @@ -30,7 +32,9 @@ ChatView::ChatView(BufferId bufferId, QWidget *parent) : QGraphicsView(parent), - AbstractChatView() + AbstractChatView(), + _bufferContainer(0), + _currentScaleFactor(1) { QList filterList; filterList.append(bufferId); @@ -40,49 +44,116 @@ ChatView::ChatView(BufferId bufferId, QWidget *parent) ChatView::ChatView(MessageFilter *filter, QWidget *parent) : QGraphicsView(parent), - AbstractChatView() + AbstractChatView(), + _bufferContainer(0), + _currentScaleFactor(1) { init(filter); } 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); + // setTransformationAnchor(QGraphicsView::NoAnchor); + setTransformationAnchor(QGraphicsView::AnchorViewCenter); - _scene = new ChatScene(filter, filter->idString(), viewport()->width() - 2, this); // see below: resizeEvent() + _scrollTimer.setInterval(100); + _scrollTimer.setSingleShot(true); + connect(&_scrollTimer, SIGNAL(timeout()), SLOT(scrollTimerTimeout())); + + _scene = new ChatScene(filter, filter->idString(), viewport()->width() - 4, 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))); + connect(_scene, SIGNAL(mouseMoveWhileSelecting(const QPointF &)), this, SLOT(mouseMoveWhileSelecting(const QPointF &))); setScene(_scene); connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(verticalScrollbarChanged(int))); } +bool ChatView::event(QEvent *event) { + if(event->type() == QEvent::KeyPress) { + QKeyEvent *keyEvent = static_cast(event); + switch(keyEvent->key()) { + case Qt::Key_Up: + case Qt::Key_Down: + case Qt::Key_PageUp: + case Qt::Key_PageDown: + if(!verticalScrollBar()->isVisible()) { + scene()->requestBacklog(); + return true; + } + default: + break; + } + } + + if(event->type() == QEvent::Wheel) { + if(!verticalScrollBar()->isVisible()) { + scene()->requestBacklog(); + return true; + } + } + + return QGraphicsView::event(event); +} + 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::mouseMoveWhileSelecting(const QPointF &scenePos) { + int y = (int)mapFromScene(scenePos).y(); + _scrollOffset = 0; + if(y < 0) + _scrollOffset = y; + else if(y > height()) + _scrollOffset = y - height(); + + if(_scrollOffset && !_scrollTimer.isActive()) + _scrollTimer.start(); } -void ChatView::verticalScrollbarChanged(int newPos) { +void ChatView::scrollTimerTimeout() { + // scroll view QAbstractSlider *vbar = verticalScrollBar(); - Q_ASSERT(vbar); + if(_scrollOffset < 0 && vbar->value() > 0) + vbar->setValue(qMax(vbar->value() + _scrollOffset, 0)); + else if(_scrollOffset > 0 && vbar->value() < vbar->maximum()) + vbar->setValue(qMin(vbar->value() + _scrollOffset, vbar->maximum())); +} + +void ChatView::lastLineChanged(QGraphicsItem *chatLine, qreal offset) { + Q_UNUSED(chatLine) + // disabled until further testing/discussion + //if(!scene()->isScrollingAllowed()) + // return; - if(vbar->maximum() - vbar->value() <= 5) // FIXME workaround the fact that the view gets scrolled up a few px on buffer change + QAbstractSlider *vbar = verticalScrollBar(); + Q_ASSERT(vbar); + if(vbar->maximum() - vbar->value() <= (offset + 5) * _currentScaleFactor ) { // 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) @@ -105,3 +176,30 @@ MsgId ChatView::lastMsgId() const { return model->data(model->index(model->rowCount() - 1, 0), MessageModel::MsgIdRole).value(); } + +void ChatView::addActionsToMenu(QMenu *menu, const QPointF &pos) { + // zoom actions + BufferWidget *bw = qobject_cast(bufferContainer()); + if(bw) { + bw->addActionsToMenu(menu, pos); + menu->addSeparator(); + } +} + +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::zoomOriginal() { + scale(1/_currentScaleFactor, 1/_currentScaleFactor); + _currentScaleFactor = 1; + scene()->setWidth(viewport()->width() - 2); +}