X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatview.cpp;h=3c7d8cf9d59ea24d4bc8275a170b54e9a73c73d6;hp=02d61b261bf766142fcedb1dca6f06a6b6b467e8;hb=9fb25d34cfc4dee02159b112c72e018c6e26e63f;hpb=e920325766f65e66132c20e4cb1da8f8e3f5e030 diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp index 02d61b26..3c7d8cf9 100644 --- a/src/qtui/chatview.cpp +++ b/src/qtui/chatview.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -19,18 +19,23 @@ ***************************************************************************/ #include +#include +#include #include -#include "chatlinemodelitem.h" +#include "bufferwidget.h" #include "chatscene.h" #include "chatview.h" #include "client.h" #include "messagefilter.h" -#include "quasselui.h" +#include "qtui.h" +#include "qtuistyle.h" ChatView::ChatView(BufferId bufferId, QWidget *parent) : QGraphicsView(parent), - AbstractChatView() + AbstractChatView(), + _bufferContainer(0), + _currentScaleFactor(1) { QList filterList; filterList.append(bufferId); @@ -40,7 +45,9 @@ ChatView::ChatView(BufferId bufferId, QWidget *parent) ChatView::ChatView(MessageFilter *filter, QWidget *parent) : QGraphicsView(parent), - AbstractChatView() + AbstractChatView(), + _bufferContainer(0), + _currentScaleFactor(1) { init(filter); } @@ -49,25 +56,98 @@ 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); + setTransformationAnchor(QGraphicsView::AnchorViewCenter); - _scene = new ChatScene(filter, filter->idString(), this); - connect(_scene, SIGNAL(heightChangedAt(qreal, qreal)), this, SLOT(sceneHeightChangedAt(qreal, qreal))); + _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 *, qreal)), this, SLOT(lastLineChanged(QGraphicsItem *, qreal))); + connect(_scene, SIGNAL(mouseMoveWhileSelecting(const QPointF &)), this, SLOT(mouseMoveWhileSelecting(const QPointF &))); setScene(_scene); - _lastScrollbarPos = 0; connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(verticalScrollbarChanged(int))); + connect(QtUi::style(), SIGNAL(changed()), this, SLOT(styleChanged())); +} + +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) { - scene()->setWidth(event->size().width() - 2); // FIXME figure out why we have to hardcode the -2 here + QGraphicsView::resizeEvent(event); + + // 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() - 4, 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::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::scrollTimerTimeout() { + // scroll view + QAbstractSlider *vbar = verticalScrollBar(); + 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; + + QAbstractSlider *vbar = verticalScrollBar(); + Q_ASSERT(vbar); + if(vbar->maximum() - vbar->value() <= (offset + 5) * _currentScaleFactor ) { // 5px grace area + vbar->setValue(vbar->maximum()); } } @@ -75,6 +155,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) @@ -85,6 +166,16 @@ void ChatView::verticalScrollbarChanged(int newPos) { } } _lastScrollbarPos = newPos; + + // FIXME: Fugly workaround for the ChatView scrolling up 1px on buffer switch + if(vbar->maximum() - newPos <= 2) + vbar->setValue(vbar->maximum()); +} + +void ChatView::styleChanged() { + invalidateScene(); + if(scene()) + scene()->update(); } MsgId ChatView::lastMsgId() const { @@ -97,3 +188,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); +}