X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=10ef5d8f7069c143e0b45d47840153097dba77a2;hp=c3a07b15884440ff1cbf826bc03ea753d54c91b9;hb=46ddb293c61aeb90295fa1a14be71e8896f34ade;hpb=ba934ceb1bfe30d01d5fb5c072c3197f8080be04 diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index c3a07b15..10ef5d8f 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -34,6 +34,7 @@ #include "qtui.h" #include "qtuistyle.h" #include "chatviewsettings.h" +#include "webpreviewitem.h" const qreal minContentsWidth = 200; @@ -43,6 +44,7 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w _model(model), _singleBufferScene(false), _sceneRect(0, 0, width, 0), + _viewportHeight(0), _selectingItem(0), _selectionStart(-1), _isSelecting(false), @@ -89,34 +91,45 @@ 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(); + qreal h = 0; qreal y = _sceneRect.y(); qreal width = _sceneRect.width(); bool atTop = true; bool atBottom = false; bool moveTop = false; - bool hasWidth = (width != 0); - if(start > 0) { - y = _lines.value(start - 1)->y() + _lines.value(start - 1)->height(); + if(start > 0 && start < _lines.count()) { + y = _lines.value(start)->y(); atTop = false; } - if(start == _lines.count()) + if(start == _lines.count()) { + y = _sceneRect.bottom(); + atTop = false; atBottom = true; + } - for(int i = end; i >= start; i--) { - ChatLine *line = new ChatLine(i, model()); - _lines.insert(start, line); + qreal contentsWidth = width - secondColumnHandle()->sceneRight(); + qreal senderWidth = secondColumnHandle()->sceneLeft() - firstColumnHandle()->sceneRight(); + qreal timestampWidth = firstColumnHandle()->sceneLeft(); + 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(hasWidth) { - if(atTop) { - h -= line->setGeometry(width); - line->setPos(0, y+h); - } else { - line->setPos(0, y+h); - h += line->setGeometry(width); - } - } } // update existing items @@ -138,8 +151,9 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { qreal offset = h; int moveStart = 0; int moveEnd = _lines.count() - 1; - ChatLine *line = 0; - if(end > _lines.count() - end) { + // move top means: moving 0 to end (aka: end + 1) + // move top means: moving end + 1 to _lines.count() - 1 (aka: _lines.count() - (end + 1) + if(end + 1 < _lines.count() - end - 1) { // move top part moveTop = true; offset = -offset; @@ -148,6 +162,7 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { // move bottom part moveStart = start; } + ChatLine *line = 0; for(int i = moveStart; i <= moveEnd; i++) { line = _lines.at(i); line->setPos(0, line->pos().y() + offset); @@ -156,10 +171,10 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { // update sceneRect if(atTop || moveTop) { - updateSceneRect(_sceneRect.adjusted(0, h, 0, 0)); + updateSceneRect(_sceneRect.adjusted(0, -h, 0, 0)); } else { updateSceneRect(_sceneRect.adjusted(0, 0, 0, h)); - emit sceneHeightChanged(h); + emit lastLineChanged(_lines.last()); } } @@ -167,6 +182,8 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { 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); @@ -206,8 +223,7 @@ void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e qreal offset = h; int moveStart = 0; int moveEnd = _lines.count() - 1; - ChatLine *line = 0; - if(start > _lines.count() - end) { + if(start < _lines.count() - start) { // move top part moveTop = true; moveEnd = start - 1; @@ -216,6 +232,7 @@ void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e moveStart = start; offset = -offset; } + ChatLine *line = 0; for(int i = moveStart; i <= moveEnd; i++) { line = _lines.at(i); line->setPos(0, line->pos().y() + offset); @@ -230,31 +247,57 @@ void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e } } +void ChatScene::updateForViewport(qreal width, qreal height) { + _viewportHeight = height; + setWidth(width); +} + +// setWidth is used for 2 things: +// a) updating the scene to fit the width of the corresponding view +// b) to update the positions of the items if a columhandle has changed it's position +// forceReposition is true in the second case +// this method features some codeduplication for the sake of performance void ChatScene::setWidth(qreal width, bool forceReposition) { if(width == _sceneRect.width() && !forceReposition) return; - // clock_t startT = clock(); - qreal oldHeight = _sceneRect.height(); - qreal y = _sceneRect.y(); - qreal linePos = y; - - foreach(ChatLine *line, _lines) { - line->setPos(0, linePos); - linePos += line->setGeometry(width); +// clock_t startT = clock(); + + qreal linePos = _sceneRect.y() + _sceneRect.height(); + qreal yBottom = linePos; + QList::iterator lineIter = _lines.end(); + QList::iterator lineIterBegin = _lines.begin(); + ChatLine *line = 0; + qreal lineHeight = 0; + qreal contentsWidth = width - secondColumnHandle()->sceneRight(); + + if(forceReposition) { + qreal timestampWidth = firstColumnHandle()->sceneLeft(); + qreal senderWidth = secondColumnHandle()->sceneLeft() - firstColumnHandle()->sceneRight(); + QPointF senderPos(firstColumnHandle()->sceneRight(), 0); + QPointF contentsPos(secondColumnHandle()->sceneRight(), 0); + while(lineIter != lineIterBegin) { + lineIter--; + line = *lineIter; + lineHeight = line->setColumns(timestampWidth, senderWidth, contentsWidth, senderPos, contentsPos); + linePos -= lineHeight; + line->setPos(0, linePos); + } + } else { + while(lineIter != lineIterBegin) { + lineIter--; + line = *lineIter; + lineHeight = line->setGeometryByWidth(width, contentsWidth); + linePos -= lineHeight; + line->setPos(0, linePos); + } } - qreal height = linePos - y; - - updateSceneRect(QRectF(0, y, width, height)); + updateSceneRect(QRectF(0, linePos, width, yBottom - linePos)); setHandleXLimits(); - qreal dh = height - oldHeight; - if(dh > 0) - emit sceneHeightChanged(dh); - - // clock_t endT = clock(); - // qDebug() << "resized" << _lines.count() << "in" << (float)(endT - startT) / CLOCKS_PER_SEC << "sec"; +// clock_t endT = clock(); +// qDebug() << "resized" << _lines.count() << "in" << (float)(endT - startT) / CLOCKS_PER_SEC << "sec"; } void ChatScene::handlePositionChanged(qreal xpos) { @@ -416,7 +459,7 @@ QString ChatScene::selectionToString() const { } void ChatScene::requestBacklog() { - static const int REQUEST_COUNT = 100; + static const int REQUEST_COUNT = 500; int backlogSize = model()->rowCount(); if(isSingleBufferScene() && backlogSize != 0 && _lastBacklogSize + REQUEST_COUNT <= backlogSize) { QModelIndex msgIdx = model()->index(0, 0); @@ -440,3 +483,55 @@ void ChatScene::updateSceneRect(const QRectF &rect) { _sceneRect = rect; setSceneRect(rect); } + + +void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const QRectF &urlRect) { +#ifndef HAVE_WEBKIT + Q_UNUSED(parentItem) + Q_UNUSED(url) + Q_UNUSED(urlRect) +#else + if(webPreview.parentItem != parentItem) + webPreview.parentItem = parentItem; + + if(webPreview.url != url) { + webPreview.url = url; + // load a new web view and delete the old one (if exists) + if(webPreview.previewItem) { + removeItem(webPreview.previewItem); + delete webPreview.previewItem; + } + webPreview.previewItem = new WebPreviewItem(url); + addItem(webPreview.previewItem); + } + if(webPreview.urlRect != urlRect) { + webPreview.urlRect = urlRect; + qreal previewY = urlRect.bottom(); + qreal previewX = urlRect.x(); + if(previewY + webPreview.previewItem->boundingRect().height() > sceneRect().bottom()) + previewY = urlRect.y() - webPreview.previewItem->boundingRect().height(); + + if(previewX + webPreview.previewItem->boundingRect().width() > sceneRect().width()) + previewX = sceneRect().right() - webPreview.previewItem->boundingRect().width(); + + webPreview.previewItem->setPos(previewX, previewY); + } +#endif +} + +void ChatScene::clearWebPreview(ChatItem *parentItem) { +#ifndef HAVE_WEBKIT + 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(); + } +#endif +}