X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatview.cpp;h=cc5009b9f9675ea6a1fb25bf66e7509760e4772f;hp=f8fe6b8fe253aa187cc55aa08066a62644b4a84b;hb=56288a13972bf8466b57c9d5d1ec382fc7e287cc;hpb=e7075c718511b29622ca22127575a95b905d2118 diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp index f8fe6b8f..cc5009b9 100644 --- a/src/qtui/chatview.cpp +++ b/src/qtui/chatview.cpp @@ -32,12 +32,11 @@ #include "qtuistyle.h" #include "clientignorelistmanager.h" +#include "chatline.h" + ChatView::ChatView(BufferId bufferId, QWidget *parent) : QGraphicsView(parent), - AbstractChatView(), - _bufferContainer(0), - _currentScaleFactor(1), - _invalidateFilter(false) + AbstractChatView() { QList filterList; filterList.append(bufferId); @@ -47,17 +46,19 @@ ChatView::ChatView(BufferId bufferId, QWidget *parent) ChatView::ChatView(MessageFilter *filter, QWidget *parent) : QGraphicsView(parent), - AbstractChatView(), - _bufferContainer(0), - _currentScaleFactor(1), - _invalidateFilter(false) + AbstractChatView() { init(filter); } void ChatView::init(MessageFilter *filter) { + _bufferContainer = 0; + _currentScaleFactor = 1; + _invalidateFilter = false; + setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - setAlignment(Qt::AlignBottom); + setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); + setAlignment(Qt::AlignLeft|Qt::AlignBottom); setInteractive(true); //setOptimizationFlags(QGraphicsView::DontClipPainter | QGraphicsView::DontAdjustForAntialiasing); // setOptimizationFlags(QGraphicsView::DontAdjustForAntialiasing); @@ -69,16 +70,19 @@ void ChatView::init(MessageFilter *filter) { _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 &))); + _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); connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(verticalScrollbarChanged(int))); + _lastScrollbarPos = verticalScrollBar()->value(); + + connect(Client::networkModel(), SIGNAL(markerLineSet(BufferId,MsgId)), SLOT(markerLineSet(BufferId,MsgId))); // only connect if client is synched with a core - if(Client::isSynced()) + if(Client::isConnected()) connect(Client::ignoreListManager(), SIGNAL(ignoreListChanged()), this, SLOT(invalidateFilter())); } @@ -91,8 +95,8 @@ bool ChatView::event(QEvent *event) { case Qt::Key_PageUp: case Qt::Key_PageDown: if(!verticalScrollBar()->isVisible()) { - scene()->requestBacklog(); - return true; + scene()->requestBacklog(); + return true; } default: break; @@ -117,15 +121,28 @@ bool ChatView::event(QEvent *event) { void ChatView::resizeEvent(QResizeEvent *event) { QGraphicsView::resizeEvent(event); + // FIXME: do we really need to scroll down on resize? + // 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()); + scene()->updateForViewport(viewport()->width(), viewport()->height()); + adjustSceneRect(); _lastScrollbarPos = verticalScrollBar()->maximum(); verticalScrollBar()->setValue(verticalScrollBar()->maximum()); + + checkChatLineCaches(); +} + +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) { @@ -191,7 +208,83 @@ MsgId ChatView::lastMsgId() const { if(!model || model->rowCount() == 0) return MsgId(); - return model->data(model->index(model->rowCount() - 1, 0), MessageModel::MsgIdRole).value(); + return model->index(model->rowCount() - 1, 0).data(MessageModel::MsgIdRole).value(); +} + +MsgId ChatView::lastVisibleMsgId() const { + ChatLine *line = lastVisibleChatLine(); + + if(line) + return line->msgId(); + + return MsgId(); +} + +bool chatLinePtrLessThan(ChatLine *one, ChatLine *other) { + return one->row() < other->row(); +} + +// TODO: figure out if it's cheaper to use a cached list (that we'd need to keep updated) +QSet ChatView::visibleChatLines(Qt::ItemSelectionMode mode) const { + QSet result; + foreach(QGraphicsItem *item, items(viewport()->rect().adjusted(-1, -1, 1, 1), mode)) { + ChatLine *line = qgraphicsitem_cast(item); + if(line) + result.insert(line); + } + return result; +} + +QList ChatView::visibleChatLinesSorted(Qt::ItemSelectionMode mode) const { + QList result = visibleChatLines(mode).toList(); + qSort(result.begin(), result.end(), chatLinePtrLessThan); + return result; +} + +ChatLine *ChatView::lastVisibleChatLine(bool ignoreDayChange) const { + if(!scene()) + return 0; + + QAbstractItemModel *model = scene()->model(); + if(!model || model->rowCount() == 0) + return 0; + + int row = -1; + + QSet visibleLines = visibleChatLines(Qt::ContainsItemBoundingRect); + foreach(ChatLine *line, visibleLines) { + if(line->row() > row && (ignoreDayChange? line->msgType() != Message::DayChange : true)) + row = line->row(); + } + + if(row >= 0) + return scene()->chatLine(row); + + return 0; +} + +void ChatView::setMarkerLineVisible(bool visible) { + scene()->setMarkerLineVisible(visible); +} + +void ChatView::setMarkerLine(MsgId msgId) { + if(!scene()->isSingleBufferScene()) + return; + + BufferId bufId = scene()->singleBufferId(); + Client::setMarkerLine(bufId, msgId); +} + +void ChatView::markerLineSet(BufferId buffer, MsgId msgId) { + if(!scene()->isSingleBufferScene() || scene()->singleBufferId() != buffer) + return; + + scene()->setMarkerLine(msgId); + scene()->setMarkerLineVisible(true); +} + +void ChatView::jumpToMarkerLine(bool requestBacklog) { + scene()->jumpToMarkerLine(requestBacklog); } void ChatView::addActionsToMenu(QMenu *menu, const QPointF &pos) { @@ -233,3 +326,29 @@ void ChatView::invalidateFilter() { _invalidateFilter = true; } } + +void ChatView::scrollContentsBy(int dx, int dy) { + QGraphicsView::scrollContentsBy(dx, dy); + checkChatLineCaches(); +} + +void ChatView::setHasCache(ChatLine *line, bool hasCache) { + if(hasCache) + _linesWithCache.insert(line); + else + _linesWithCache.remove(line); +} + +void ChatView::checkChatLineCaches() { + qreal top = mapToScene(viewport()->rect().topLeft()).y() - 10; // some grace area to avoid premature cleaning + qreal bottom = mapToScene(viewport()->rect().bottomRight()).y() + 10; + QSet::iterator iter = _linesWithCache.begin(); + while(iter != _linesWithCache.end()) { + ChatLine *line = *iter; + if(line->pos().y() + line->height() < top || line->pos().y() > bottom) { + line->clearCache(); + iter = _linesWithCache.erase(iter); + } else + ++iter; + } +}