X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatview.cpp;h=c6e6209502dd5f3dd1b268fb45fe238b011caee9;hp=e61dc9e8888bc5b684b3491a2be254a0994dbac9;hb=d57c91811b8f989bcaa4d5a238c65e9ffcc3b1d4;hpb=77176474b628e801ba94d9d50d0d961a12aa01c4 diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp index e61dc9e8..c6e62095 100644 --- a/src/qtui/chatview.cpp +++ b/src/qtui/chatview.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 by the Quassel Project * + * Copyright (C) 2005-2016 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include @@ -35,337 +35,420 @@ #include "chatline.h" ChatView::ChatView(BufferId bufferId, QWidget *parent) - : QGraphicsView(parent), + : QGraphicsView(parent), AbstractChatView() { - QList filterList; - filterList.append(bufferId); - MessageFilter *filter = new MessageFilter(Client::messageModel(), filterList, this); - init(filter); + QList filterList; + filterList.append(bufferId); + MessageFilter *filter = new MessageFilter(Client::messageModel(), filterList, this); + init(filter); } + ChatView::ChatView(MessageFilter *filter, QWidget *parent) - : QGraphicsView(parent), + : QGraphicsView(parent), AbstractChatView() { - init(filter); + init(filter); } -void ChatView::init(MessageFilter *filter) { - _bufferContainer = 0; - _currentScaleFactor = 1; - _invalidateFilter = false; - _markerLineVisible = true; - _markedLine = 0; - - setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - 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); - - _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); - - 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::isConnected()) - connect(Client::ignoreListManager(), SIGNAL(ignoreListChanged()), this, SLOT(invalidateFilter())); + +void ChatView::init(MessageFilter *filter) +{ + _bufferContainer = 0; + _currentScaleFactor = 1; + _invalidateFilter = false; + + setAttribute(Qt::WA_AcceptTouchEvents); + setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + 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); + + _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); + + connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(verticalScrollbarChanged(int))); + _lastScrollbarPos = verticalScrollBar()->maximum(); + + connect(Client::networkModel(), SIGNAL(markerLineSet(BufferId, MsgId)), SLOT(markerLineSet(BufferId, MsgId))); + + // 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(); + +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::TouchBegin) { + // Enable scrolling by draging, disable selecting/clicking content + setDragMode(QGraphicsView::ScrollHandDrag); + setInteractive(false); + // if scrollbar is not visible we need to request backlog below else we need to accept + // the event now (return true) so that we will receive TouchUpdate and TouchEnd/TouchCancel + if (verticalScrollBar()->isVisible()) return true; + } + +#if QT_VERSION >= 0x050000 + if (event->type() == QEvent::TouchEnd || event->type() == QEvent::TouchCancel) { +#else + if (event->type() == QEvent::TouchEnd) { +#endif + // End scroll and reset settings to default + setDragMode(QGraphicsView::NoDrag); + setInteractive(true); + _firstTouchUpdateHappened = false; return true; - } - default: - break; } - } - if(event->type() == QEvent::Wheel) { - if(!verticalScrollBar()->isVisible()) { - scene()->requestBacklog(); - return true; + if (event->type() == QEvent::TouchUpdate) { + if (!_firstTouchUpdateHappened) { + // After the first movement of a Touch-Point, calculate the distance in both axis + // and if the point moved more horizontally abort scroll. + QTouchEvent::TouchPoint p = ((QTouchEvent*)event)->touchPoints().at(0); + double dx = abs (p.lastPos().x() - p.pos().x()); + double dy = abs (p.lastPos().y() - p.pos().y()); + if (dx > dy) { + setDragMode(QGraphicsView::NoDrag); + setInteractive(true); + } + _firstTouchUpdateHappened = true; + } + // Applying the movement happens automatically by the drag-mode } - } - if(event->type() == QEvent::Show) { - if(_invalidateFilter) - invalidateFilter(); - } + if (event->type() == QEvent::Wheel || event->type() == QEvent::TouchBegin || event->type() == QEvent::TouchUpdate) { + if (!verticalScrollBar()->isVisible()) { + scene()->requestBacklog(); + return true; + } + } + + if (event->type() == QEvent::Show) { + if (_invalidateFilter) + invalidateFilter(); + } - return QGraphicsView::event(event); + return QGraphicsView::event(event); } -void ChatView::resizeEvent(QResizeEvent *event) { - QGraphicsView::resizeEvent(event); - // FIXME: do we really need to scroll down on resize? +void ChatView::resizeEvent(QResizeEvent *event) +{ + // if view is currently scrolled to bottom, we want it that way after resizing + bool atBottom = (_lastScrollbarPos == verticalScrollBar()->maximum()); + + QGraphicsView::resizeEvent(event); - // 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(); + // if scrolling to bottom, do it immediately. + if(atBottom) + { + // we can reduce viewport updates if we scroll to the bottom allready at the beginning + verticalScrollBar()->setValue(verticalScrollBar()->maximum()); + } - _lastScrollbarPos = verticalScrollBar()->maximum(); - verticalScrollBar()->setValue(verticalScrollBar()->maximum()); + scene()->updateForViewport(viewport()->width(), viewport()->height()); + adjustSceneRect(); - checkChatLineCaches(); + if(atBottom) + { + _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::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::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()); - } +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::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) - relativePos = (newPos - vbar->minimum()) * 100 / (vbar->maximum() - vbar->minimum()); +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()); + } +} + - if(relativePos < 20) { - scene()->requestBacklog(); +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) + relativePos = (newPos - vbar->minimum()) * 100 / (vbar->maximum() - vbar->minimum()); + + if (relativePos < 20) { + scene()->requestBacklog(); + } } - } - _lastScrollbarPos = newPos; + _lastScrollbarPos = newPos; - // FIXME: Fugly workaround for the ChatView scrolling up 1px on buffer switch - if(vbar->maximum() - newPos <= 2) - vbar->setValue(vbar->maximum()); + // 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 { - if(!scene()) - return MsgId(); - QAbstractItemModel *model = scene()->model(); - if(!model || model->rowCount() == 0) - return MsgId(); +MsgId ChatView::lastMsgId() const +{ + if (!scene()) + return MsgId(); + + QAbstractItemModel *model = scene()->model(); + if (!model || model->rowCount() == 0) + return MsgId(); - return model->index(model->rowCount() - 1, 0).data(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(); +MsgId ChatView::lastVisibleMsgId() const +{ + ChatLine *line = lastVisibleChatLine(); + + if (line) + return line->msgId(); - return MsgId(); + return MsgId(); } -bool chatLinePtrLessThan(ChatLine *one, ChatLine *other) { - return one->row() < other->row(); + +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; +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; + +QList ChatView::visibleChatLinesSorted(Qt::ItemSelectionMode mode) const +{ + QList result = visibleChatLines(mode).toList(); + qSort(result.begin(), result.end(), chatLinePtrLessThan); + return result; } -ChatLine *ChatView::lastVisibleChatLine() const { - if(!scene()) - return 0; - QAbstractItemModel *model = scene()->model(); - if(!model || model->rowCount() == 0) - return 0; +ChatLine *ChatView::lastVisibleChatLine(bool ignoreDayChange) const +{ + if (!scene()) + return 0; - int row = -1; + QAbstractItemModel *model = scene()->model(); + if (!model || model->rowCount() == 0) + return 0; - QSet visibleLines = visibleChatLines(Qt::ContainsItemBoundingRect); - foreach(ChatLine *line, visibleLines) { - if(line->row() > row) - row = line->row(); - } + int row = -1; - if(row >= 0) - return scene()->chatLine(row); + QSet visibleLines = visibleChatLines(Qt::ContainsItemBoundingRect); + foreach(ChatLine *line, visibleLines) { + if (line->row() > row && (ignoreDayChange ? line->msgType() != Message::DayChange : true)) + row = line->row(); + } - return 0; + if (row >= 0) + return scene()->chatLine(row); + + return 0; } -void ChatView::setMarkerLineVisible(bool visible) { - if(visible != _markerLineVisible) { - _markerLineVisible = visible; - } + +void ChatView::setMarkerLineVisible(bool visible) +{ + scene()->setMarkerLineVisible(visible); } -void ChatView::setMarkedLine(ChatLine *line) { - if(_markedLine == line) - return; - if(!scene()->isSingleBufferScene()) - return; +void ChatView::setMarkerLine(MsgId msgId) +{ + if (!scene()->isSingleBufferScene()) + return; - if(line) { BufferId bufId = scene()->singleBufferId(); - Client::setMarkerLine(bufId, line->msgId()); - } + Client::setMarkerLine(bufId, msgId); } -void ChatView::markerLineSet(BufferId buffer, MsgId msg) { - if(!scene()->isSingleBufferScene() || scene()->singleBufferId() != buffer) - return; - ChatLine *newLine = scene()->chatLine(msg); - if(_markedLine == newLine) - return; +void ChatView::markerLineSet(BufferId buffer, MsgId msgId) +{ + if (!scene()->isSingleBufferScene() || scene()->singleBufferId() != buffer) + return; - ChatLine *oldLine = _markedLine; - _markedLine = newLine; + scene()->setMarkerLine(msgId); + scene()->setMarkerLineVisible(true); +} - if(oldLine) - oldLine->update(); - if(newLine) { - setMarkerLineVisible(true); - newLine->update(); - } +void ChatView::jumpToMarkerLine(bool requestBacklog) +{ + scene()->jumpToMarkerLine(requestBacklog); } -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::addActionsToMenu(QMenu *menu, const QPointF &pos) +{ + // zoom actions + BufferWidget *bw = qobject_cast(bufferContainer()); + if (bw) { + bw->addActionsToMenu(menu, pos); + menu->addSeparator(); + } } -void ChatView::zoomIn() { + +void ChatView::zoomIn() +{ _currentScaleFactor *= 1.2; scale(1.2, 1.2); scene()->setWidth(viewport()->width() / _currentScaleFactor - 2); } -void ChatView::zoomOut() { + +void ChatView::zoomOut() +{ _currentScaleFactor /= 1.2; scale(1 / 1.2, 1 / 1.2); scene()->setWidth(viewport()->width() / _currentScaleFactor - 2); } -void ChatView::zoomOriginal() { + +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; - } + +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; + } } -void ChatView::scrollContentsBy(int dx, int dy) { - QGraphicsView::scrollContentsBy(dx, dy); - checkChatLineCaches(); + +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::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; - } + +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; + } }