X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatview.cpp;h=71c14276b5cfb676a5245779f371573c0de85c1b;hp=6bdc650a5fbb978516d22f1b54270832ab94bdfd;hb=dfcf836c5f1f57cadcdbea5c5a7a7034d21ce332;hpb=3d680525678f840e30cef959ff91ee8c7e3d2e17 diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp index 6bdc650a..71c14276 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,25 @@ ***************************************************************************/ #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" +#include "clientignorelistmanager.h" ChatView::ChatView(BufferId bufferId, QWidget *parent) : QGraphicsView(parent), - AbstractChatView() + AbstractChatView(), + _bufferContainer(0), + _currentScaleFactor(1), + _invalidateFilter(false) { QList filterList; filterList.append(bufferId); @@ -40,41 +47,137 @@ ChatView::ChatView(BufferId bufferId, QWidget *parent) ChatView::ChatView(MessageFilter *filter, QWidget *parent) : QGraphicsView(parent), - AbstractChatView() + AbstractChatView(), + _bufferContainer(0), + _currentScaleFactor(1), + _invalidateFilter(false) { init(filter); } void ChatView::init(MessageFilter *filter) { setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - setAlignment(Qt::AlignBottom); + setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); + setAlignment(Qt::AlignLeft|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(), viewport()->width() - 2, this); // see below: resizeEvent() - connect(_scene, SIGNAL(sceneHeightChanged(qreal)), this, SLOT(sceneHeightChanged(qreal))); + _scrollTimer.setInterval(100); + _scrollTimer.setSingleShot(true); + connect(&_scrollTimer, SIGNAL(timeout()), SLOT(scrollTimerTimeout())); + + _scene = new ChatScene(filter, filter->idString(), viewport()->width(), this); + connect(_scene, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(adjustSceneRect())); + 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 = verticalScrollBar()->maximum(); connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(verticalScrollbarChanged(int))); + _lastScrollbarPos = verticalScrollBar()->value(); + + // only connect if client is synched with a core + if(Client::isConnected()) + connect(Client::ignoreListManager(), SIGNAL(ignoreListChanged()), this, SLOT(invalidateFilter())); +} + +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; + } + } + + if(event->type() == QEvent::Show) { + if(_invalidateFilter) + invalidateFilter(); + } + + return QGraphicsView::event(event); } 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 + + // we can reduce viewport updates if we scroll to the bottom allready at the beginning verticalScrollBar()->setValue(verticalScrollBar()->maximum()); + scene()->updateForViewport(viewport()->width(), viewport()->height()); + adjustSceneRect(); + + _lastScrollbarPos = verticalScrollBar()->maximum(); + verticalScrollBar()->setValue(verticalScrollBar()->maximum()); +} + +void ChatView::adjustSceneRect() { + // Workaround for QTBUG-6322 + // If the viewport's sceneRect() is (almost) as wide as as the viewport itself, + // Qt wants to reserve space for scrollbars even if they're turned off, resulting in + // an ugly white space at the bottom of the ChatView. + // Since the view's scene's width actually doesn't matter at all, we just adjust it + // by some hopefully large enough value to avoid this problem. + + setSceneRect(scene()->sceneRect().adjusted(0, 0, -25 ,0)); +} + +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::sceneHeightChanged(qreal dh) { +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() <= 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() <= (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) @@ -85,6 +188,10 @@ 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()); } MsgId ChatView::lastMsgId() const { @@ -97,3 +204,43 @@ 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); +} + +void ChatView::invalidateFilter() { + // if this is the currently selected chatview + // invalidate immediately + if(isVisible()) { + _scene->filter()->invalidateFilter(); + _invalidateFilter = false; + } + // otherwise invalidate whenever the view is shown + else { + _invalidateFilter = true; + } +}