X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=89d4422a6f366d018f8efaf8c08614a96babd5eb;hb=2ab3040da0e42f4afdd282e34f0d8b089020a73d;hp=55e3c4e66710b5fce82be1a0392da630df7376d8;hpb=012e439e5ed275884fb8c5006c62fb3f6bfac27c;p=quassel.git diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index 55e3c4e6..89d4422a 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,6 +39,11 @@ 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), @@ -85,6 +91,12 @@ 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())); + + // installEventFilter(this); + setItemIndexMethod(QGraphicsScene::NoIndex); } ChatScene::~ChatScene() { @@ -92,9 +104,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(); @@ -122,20 +131,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); - if(atTop) { + 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); - } else { + _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); } - _lines.insert(i, line); - addItem(line); } // update existing items @@ -166,7 +183,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++) { @@ -175,22 +192,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); @@ -509,13 +533,21 @@ void ChatScene::updateSceneRect() { } // we hide day change messages at the top by making the scene rect smaller + // 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; - do { - _firstLineRow++; + while(_firstLineRow < numRows) { firstLineIdx = model()->index(_firstLineRow, 0); - } while((Message::Type)(model()->data(firstLineIdx, MessageModel::TypeRole).toInt()) == Message::DayChange && _firstLineRow < numRows); + 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 @@ -532,8 +564,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 @@ -552,7 +594,7 @@ void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const Q delete webPreview.previewItem; } webPreview.previewItem = new WebPreviewItem(url); - addItem(webPreview.previewItem); + webPreview.delayTimer.start(2000); } if(webPreview.urlRect != urlRect) { webPreview.urlRect = urlRect; @@ -574,14 +616,38 @@ void ChatScene::clearWebPreview(ChatItem *parentItem) { Q_UNUSED(parentItem) #else if(parentItem == 0 || webPreview.parentItem == parentItem) { - if(webPreview.previewItem) { + // 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) { + if(webPreview.previewItem->scene()) { removeItem(webPreview.previewItem); - delete webPreview.previewItem; - webPreview.previewItem = 0; } - webPreview.parentItem = 0; - webPreview.url = QString(); - webPreview.urlRect = QRectF(); + delete webPreview.previewItem; + webPreview.previewItem = 0; } + webPreview.parentItem = 0; + webPreview.url = QString(); + webPreview.urlRect = QRectF(); #endif } + +bool ChatScene::eventFilter(QObject *watched, QEvent *event) { + qDebug() << watched << event; + return false; +} +