X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=d02bfc64a7429b4e3393a9942fe0cc03b7314c12;hp=7ba9ada9addd0bfdc9e21f867c861c2c9510ee80;hb=514e28135038076a91d3b4853b41b258551bd196;hpb=de8ae1e75bbe0b429647db7da758a51323385e57 diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index 7ba9ada9..d02bfc64 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include "chatitem.h" #include "chatline.h" @@ -38,12 +39,18 @@ const qreal minContentsWidth = 200; +class ChatScene::ClearWebPreviewEvent : public QEvent { +public: + inline ClearWebPreviewEvent() : QEvent((QEvent::Type)ChatScene::ClearWebPreviewEventType) {} +}; + ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal width, QObject *parent) : QGraphicsScene(0, 0, width, 0, parent), _idString(idString), _model(model), _singleBufferScene(false), _sceneRect(0, 0, width, 0), + _firstLineRow(-1), _viewportHeight(0), _selectingItem(0), _selectionStart(-1), @@ -84,6 +91,11 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w if(model->rowCount() > 0) rowsInserted(QModelIndex(), 0, model->rowCount() - 1); + + webPreview.delayTimer.setSingleShot(true); + connect(&webPreview.delayTimer, SIGNAL(timeout()), this, SLOT(showWebPreview())); + webPreview.deleteTimer.setInterval(600000); + connect(&webPreview.deleteTimer, SIGNAL(timeout()), this, SLOT(deleteWebPreview())); } ChatScene::~ChatScene() { @@ -91,9 +103,6 @@ ChatScene::~ChatScene() { void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { Q_UNUSED(index); - - clearWebPreview(); - // QModelIndex sidx = model()->index(start, 0); // QModelIndex eidx = model()->index(end, 0); // qDebug() << "rowsInserted" << start << end << "-" << sidx.data(MessageModel::MsgIdRole).value() << eidx.data(MessageModel::MsgIdRole).value(); @@ -121,15 +130,28 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { QPointF contentsPos(secondColumnHandle()->sceneRight(), 0); QPointF senderPos(firstColumnHandle()->sceneRight(), 0); - for(int i = start; i <= end; i++) { - ChatLine *line = new ChatLine(i, model(), - width, - timestampWidth, senderWidth, contentsWidth, - senderPos, contentsPos); - line->setPos(0, y+h); - h += line->height(); - _lines.insert(i, line); - addItem(line); + if(atTop) { + for(int i = end; i >= start; i--) { + ChatLine *line = new ChatLine(i, model(), + width, + timestampWidth, senderWidth, contentsWidth, + senderPos, contentsPos); + h += line->height(); + line->setPos(0, y-h); + _lines.insert(start, line); + addItem(line); + } + } else { + for(int i = start; i <= end; i++) { + ChatLine *line = new ChatLine(i, model(), + width, + timestampWidth, senderWidth, contentsWidth, + senderPos, contentsPos); + line->setPos(0, y+h); + h += line->height(); + _lines.insert(i, line); + addItem(line); + } } // update existing items @@ -160,7 +182,7 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { moveEnd = end; } else { // move bottom part - moveStart = start; + moveStart = end + 1; } ChatLine *line = 0; for(int i = moveStart; i <= moveEnd; i++) { @@ -169,18 +191,29 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { } } + // check if all went right + Q_ASSERT(start == 0 || _lines.at(start - 1)->pos().y() + _lines.at(start - 1)->height() == _lines.at(start)->pos().y()); + Q_ASSERT(end + 1 == _lines.count() || _lines.at(end)->pos().y() + _lines.at(end)->height() == _lines.at(end + 1)->pos().y()); + + if(!atBottom) { + if(start < _firstLineRow) { + int prevFirstLineRow = _firstLineRow + (end - start + 1); + for(int i = end + 1; i < prevFirstLineRow; i++) { + _lines.at(i)->show(); + } + } + // force new search for first proper line + _firstLineRow = -1; + } updateSceneRect(); - if(atBottom) { - emit lastLineChanged(_lines.last()); + if(atBottom || (!atTop && !moveTop)) { + emit lastLineChanged(_lines.last(), h); } - } void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) { Q_UNUSED(parent); - clearWebPreview(); - qreal h = 0; // total height of removed items; bool atTop = (start == 0); @@ -236,34 +269,28 @@ void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e } } + Q_ASSERT(start == 0 || _lines.at(start - 1)->pos().y() + _lines.at(start - 1)->height() == _lines.at(start)->pos().y()); + Q_ASSERT(end + 1 == _lines.count() || _lines.at(end)->pos().y() + _lines.at(end)->height() == _lines.at(end + 1)->pos().y()); // update sceneRect // when searching for the first non-date-line we have to take into account that our // model still contains the just removed lines so we cannot simply call updateSceneRect() - if(_lines.isEmpty()) { - updateSceneRect(QRectF(0, 0, _sceneRect.width(), 0)); - return; - } int numRows = model()->rowCount(); QModelIndex firstLineIdx; - int row = -1; + _firstLineRow = -1; bool needOffset = false; do { - row++; - if(row >= start && row <= end) { - row = end + 1; + _firstLineRow++; + if(_firstLineRow >= start && _firstLineRow <= end) { + _firstLineRow = end + 1; needOffset = true; } - firstLineIdx = model()->index(row, 0); - } while((Message::Type)(model()->data(firstLineIdx, MessageModel::TypeRole).toInt()) == Message::DayChange && row < numRows); + firstLineIdx = model()->index(_firstLineRow, 0); + } while((Message::Type)(model()->data(firstLineIdx, MessageModel::TypeRole).toInt()) == Message::DayChange && _firstLineRow < numRows); if(needOffset) - row -= end - start + 1; - - ChatLine *firstLine = _lines.at(row); - ChatLine *lastLine = _lines.last(); - - updateSceneRect(QRectF(0, firstLine->pos().y(), _sceneRect.width(), lastLine->pos().y() + lastLine->height() - firstLine->pos().y())); + _firstLineRow -= end - start + 1; + updateSceneRect(); } void ChatScene::updateForViewport(qreal width, qreal height) { @@ -501,22 +528,32 @@ int ChatScene::sectionByScenePos(int x) { } void ChatScene::updateSceneRect() { - if(_lines.isEmpty()) + if(_lines.isEmpty()) { + updateSceneRect(QRectF(0, 0, _sceneRect.width(), 0)); return; + } // we hide day change messages at the top by making the scene rect smaller - int numRows = model()->rowCount(); - int row = -1; - QModelIndex firstLineIdx; - do { - row++; - firstLineIdx = model()->index(row, 0); - } while((Message::Type)(model()->data(firstLineIdx, MessageModel::TypeRole).toInt()) == Message::DayChange && row < numRows); + // and by calling QGraphicsItem::hide() on all leading day change messages + // the first one is needed to ensure proper scrollbar ranges + // the second for cases where the viewport is larger then the set scenerect + // (in this case the items are shown anyways) + if(_firstLineRow == -1) { + int numRows = model()->rowCount(); + _firstLineRow = 0; + QModelIndex firstLineIdx; + while(_firstLineRow < numRows) { + firstLineIdx = model()->index(_firstLineRow, 0); + if((Message::Type)(model()->data(firstLineIdx, MessageModel::TypeRole).toInt()) != Message::DayChange) + break; + _lines.at(_firstLineRow)->hide(); + _firstLineRow++; + } + } // the following call should be safe. If it crashes something went wrong during insert/remove - ChatLine *firstLine = _lines.at(row); + ChatLine *firstLine = _lines.at(_firstLineRow); ChatLine *lastLine = _lines.last(); - updateSceneRect(QRectF(0, firstLine->pos().y(), _sceneRect.width(), lastLine->pos().y() + lastLine->height() - firstLine->pos().y())); } @@ -528,8 +565,18 @@ void ChatScene::updateSceneRect(qreal width) { void ChatScene::updateSceneRect(const QRectF &rect) { _sceneRect = rect; setSceneRect(rect); + update(); } +void ChatScene::customEvent(QEvent *event) { + switch(event->type()) { + case ClearWebPreviewEventType: + clearWebPreviewEvent((ClearWebPreviewEvent *)event); + break; + default: + return; + } +} void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const QRectF &urlRect) { #ifndef HAVE_WEBKIT @@ -543,12 +590,17 @@ void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const Q if(webPreview.url != url) { webPreview.url = url; // load a new web view and delete the old one (if exists) - if(webPreview.previewItem) { + if(webPreview.previewItem && webPreview.previewItem->scene()) { removeItem(webPreview.previewItem); delete webPreview.previewItem; } webPreview.previewItem = new WebPreviewItem(url); - addItem(webPreview.previewItem); + webPreview.delayTimer.start(2000); + webPreview.deleteTimer.stop(); + } else if(webPreview.previewItem && !webPreview.previewItem->scene()) { + // we just have to readd the item to the scene + webPreview.delayTimer.start(2000); + webPreview.deleteTimer.stop(); } if(webPreview.urlRect != urlRect) { webPreview.urlRect = urlRect; @@ -570,14 +622,37 @@ void ChatScene::clearWebPreview(ChatItem *parentItem) { Q_UNUSED(parentItem) #else if(parentItem == 0 || webPreview.parentItem == parentItem) { - if(webPreview.previewItem) { - removeItem(webPreview.previewItem); - delete webPreview.previewItem; - webPreview.previewItem = 0; - } - webPreview.parentItem = 0; - webPreview.url = QString(); - webPreview.urlRect = QRectF(); + // posting an event ensures that the item will not be removed as + // the result of another event. this could result in bad segfaults + QCoreApplication::postEvent(this, new ClearWebPreviewEvent()); + } +#endif +} + +void ChatScene::showWebPreview() { +#ifdef HAVE_WEBKIT + if(webPreview.previewItem) + addItem(webPreview.previewItem); +#endif +} + +void ChatScene::clearWebPreviewEvent(ClearWebPreviewEvent *event) { +#ifdef HAVE_WEBKIT + event->accept(); + if(webPreview.previewItem && webPreview.previewItem->scene()) { + removeItem(webPreview.previewItem); + webPreview.deleteTimer.start(); } + webPreview.delayTimer.stop(); #endif } + +void ChatScene::deleteWebPreview() { + if(webPreview.previewItem) { + delete webPreview.previewItem; + webPreview.previewItem = 0; + } + webPreview.parentItem = 0; + webPreview.url = QString(); + webPreview.urlRect = QRectF(); +}