X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=cab42c65988501372759cf24736f15bef64735c9;hp=4b2bf5c5e17cdc20393da2072cbceaa76c908284;hb=7cef35ccdcb26ad547383537d3615644df703c9a;hpb=0f16a547d17c536cc567bfb2746824bfca3424cd diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index 4b2bf5c5..cab42c65 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -32,7 +32,9 @@ #include "columnhandleitem.h" #include "messagefilter.h" #include "qtui.h" +#include "qtuistyle.h" #include "chatviewsettings.h" +#include "webpreviewitem.h" const qreal minContentsWidth = 200; @@ -41,6 +43,8 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w _idString(idString), _model(model), _singleBufferScene(false), + _sceneRect(0, 0, width, 0), + _viewportHeight(0), _selectingItem(0), _selectionStart(-1), _isSelecting(false), @@ -55,7 +59,7 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w int defaultFirstColHandlePos = defaultSettings.value("FirstColumnHandlePos", 80).toInt(); int defaultSecondColHandlePos = defaultSettings.value("SecondColumnHandlePos", 200).toInt(); - ChatViewSettings viewSettings(idString); + ChatViewSettings viewSettings(this); firstColHandlePos = viewSettings.value("FirstColumnHandlePos", defaultFirstColHandlePos).toInt(); secondColHandlePos = viewSettings.value("SecondColumnHandlePos", defaultSecondColHandlePos).toInt(); @@ -87,13 +91,15 @@ ChatScene::~ChatScene() { void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { Q_UNUSED(index); + + clearWebPreview(); + qreal h = 0; - qreal y = sceneRect().y(); - qreal width = sceneRect().width(); + 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(); @@ -102,19 +108,27 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { if(start == _lines.count()) atBottom = true; + 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 = end; i >= start; i--) { - ChatLine *line = new ChatLine(i, model()); + ChatLine *line = new ChatLine(i, model(), + width, + timestampWidth, senderWidth, contentsWidth, + senderPos, contentsPos); + if(atTop) { + h -= line->height(); + line->setPos(0, y+h); + } else { + line->setPos(0, y+h); + h += line->height(); + } _lines.insert(start, 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 @@ -151,13 +165,13 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { line->setPos(0, line->pos().y() + offset); } } - + // update sceneRect if(atTop || moveTop) { - setSceneRect(sceneRect().adjusted(0, h, 0, 0)); + updateSceneRect(_sceneRect.adjusted(0, h, 0, 0)); } else { - setSceneRect(sceneRect().adjusted(0, 0, 0, h)); - emit sceneHeightChanged(h); + updateSceneRect(_sceneRect.adjusted(0, 0, 0, h)); + emit lastLineChanged(_lines.last()); } } @@ -165,6 +179,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); @@ -222,34 +238,63 @@ void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e // update sceneRect if(atTop || moveTop) { - setSceneRect(sceneRect().adjusted(0, h, 0, 0)); + updateSceneRect(_sceneRect.adjusted(0, h, 0, 0)); } else { - setSceneRect(sceneRect().adjusted(0, 0, 0, -h)); + updateSceneRect(_sceneRect.adjusted(0, 0, 0, -h)); } +} +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) + if(width == _sceneRect.width() && !forceReposition) return; - 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; - - setSceneRect(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"; } void ChatScene::handlePositionChanged(qreal xpos) { @@ -263,7 +308,7 @@ void ChatScene::handlePositionChanged(qreal xpos) { secondColHandlePos = xpos; } - ChatViewSettings viewSettings(idString()); + ChatViewSettings viewSettings(this); viewSettings.setValue("FirstColumnHandlePos", firstColHandlePos); viewSettings.setValue("SecondColumnHandlePos", secondColHandlePos); @@ -278,8 +323,8 @@ void ChatScene::handlePositionChanged(qreal xpos) { } void ChatScene::setHandleXLimits() { - firstColHandle->setXLimits(0, secondColumnHandleRect().left()); - secondColHandle->setXLimits(firstColumnHandleRect().right(), width() - minContentsWidth); + firstColHandle->setXLimits(0, secondColHandle->sceneLeft()); + secondColHandle->setXLimits(firstColHandle->sceneRight(), width() - minContentsWidth); } void ChatScene::setSelectingItem(ChatItem *item) { @@ -298,12 +343,12 @@ void ChatScene::startGlobalSelection(ChatItem *item, const QPointF &itemPos) { void ChatScene::updateSelection(const QPointF &pos) { // This is somewhat hacky... we look at the contents item that is at the cursor's y position (ignoring x), since // it has the full height. From this item, we can then determine the row index and hence the ChatLine. - ChatItem *contentItem = static_cast(itemAt(QPointF(secondColumnHandleRect().right() + 1, pos.y()))); + ChatItem *contentItem = static_cast(itemAt(QPointF(secondColHandle->sceneRight() + 1, pos.y()))); if(!contentItem) return; int curRow = contentItem->row(); int curColumn; - if(pos.x() > secondColumnHandleRect().right()) curColumn = ChatLineModel::ContentsColumn; + if(pos.x() > secondColHandle->sceneRight()) curColumn = ChatLineModel::ContentsColumn; else if(pos.x() > firstColHandlePos) curColumn = ChatLineModel::SenderColumn; else curColumn = ChatLineModel::TimestampColumn; @@ -411,7 +456,7 @@ QString ChatScene::selectionToString() const { } void ChatScene::requestBacklog() { - static const int REQUEST_COUNT = 50; + static const int REQUEST_COUNT = 500; int backlogSize = model()->rowCount(); if(isSingleBufferScene() && backlogSize != 0 && _lastBacklogSize + REQUEST_COUNT <= backlogSize) { QModelIndex msgIdx = model()->index(0, 0); @@ -430,3 +475,50 @@ int ChatScene::sectionByScenePos(int x) { return ChatLineModel::ContentsColumn; } + +void ChatScene::updateSceneRect(const QRectF &rect) { + _sceneRect = rect; + setSceneRect(rect); +} + + +void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const QRectF &urlRect) { + 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); + } +} + +void ChatScene::clearWebPreview(ChatItem *parentItem) { + 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(); + } +}