X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=0a53dfee1071cf11d5dea1640f08ad91543ee3d5;hp=ff28ea4a6eea050edd2c6be66e93670e27ef741e;hb=ef6faa994fca6bf7332c7a3761b2e68a133de6dc;hpb=80fcc77b8883ef496fcf0ee9b43cf678232e175c diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index ff28ea4a..0a53dfee 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -47,10 +47,10 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w _sceneRect(0, 0, width, 0), _firstLineRow(-1), _viewportHeight(0), + _cutoffMode(CutoffRight), _selectingItem(0), _selectionStart(-1), - _isSelecting(false), - _lastBacklogSize(0) + _isSelecting(false) { MessageFilter *filter = qobject_cast(model); if(filter) { @@ -68,13 +68,14 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w _firstColHandle = new ColumnHandleItem(QtUi::style()->firstColumnSeparator()); addItem(_firstColHandle); _firstColHandle->setXPos(_firstColHandlePos); - connect(_firstColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal))); + connect(_firstColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(firstHandlePositionChanged(qreal))); connect(this, SIGNAL(sceneRectChanged(const QRectF &)), _firstColHandle, SLOT(sceneRectChanged(const QRectF &))); _secondColHandle = new ColumnHandleItem(QtUi::style()->secondColumnSeparator()); addItem(_secondColHandle); _secondColHandle->setXPos(_secondColHandlePos); - connect(_secondColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal))); + connect(_secondColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(secondHandlePositionChanged(qreal))); + connect(this, SIGNAL(sceneRectChanged(const QRectF &)), _secondColHandle, SLOT(sceneRectChanged(const QRectF &))); setHandleXLimits(); @@ -93,6 +94,8 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w webPreview.deleteTimer.setInterval(600000); connect(&webPreview.deleteTimer, SIGNAL(timeout()), this, SLOT(deleteWebPreviewEvent())); #endif + + setItemIndexMethod(QGraphicsScene::NoIndex); } ChatScene::~ChatScene() { @@ -266,8 +269,7 @@ 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()); + Q_ASSERT(start == 0 || start >= _lines.count() || _lines.at(start - 1)->pos().y() + _lines.at(start - 1)->height() == _lines.at(start)->pos().y()); // update sceneRect // when searching for the first non-date-line we have to take into account that our @@ -295,50 +297,25 @@ void ChatScene::updateForViewport(qreal width, qreal 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) +void ChatScene::setWidth(qreal width) { + if(width == _sceneRect.width()) return; -// clock_t startT = clock(); + // clock_t startT = clock(); // disabling the index while doing this complex updates is about // 2 to 10 times faster! - setItemIndexMethod(QGraphicsScene::NoIndex); + //setItemIndexMethod(QGraphicsScene::NoIndex); - qreal linePos = _sceneRect.y() + _sceneRect.height(); QList::iterator lineIter = _lines.end(); QList::iterator lineIterBegin = _lines.begin(); - ChatLine *line = 0; - qreal lineHeight = 0; + qreal linePos = _sceneRect.y() + _sceneRect.height(); 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); - } + while(lineIter != lineIterBegin) { + lineIter--; + (*lineIter)->setGeometryByWidth(width, contentsWidth, linePos); } - setItemIndexMethod(QGraphicsScene::BspTreeIndex); + //setItemIndexMethod(QGraphicsScene::BspTreeIndex); updateSceneRect(width); setHandleXLimits(); @@ -347,29 +324,72 @@ void ChatScene::setWidth(qreal width, bool forceReposition) { // qDebug() << "resized" << _lines.count() << "in" << (float)(endT - startT) / CLOCKS_PER_SEC << "sec"; } -void ChatScene::handlePositionChanged(qreal xpos) { - bool first = (sender() == _firstColHandle); - qreal oldx; - if(first) { - oldx = _firstColHandlePos; - _firstColHandlePos = xpos; - } else { - oldx = _secondColHandlePos; - _secondColHandlePos = xpos; - } +void ChatScene::firstHandlePositionChanged(qreal xpos) { + if(_firstColHandlePos == xpos) + return; + _firstColHandlePos = xpos; ChatViewSettings viewSettings(this); viewSettings.setValue("FirstColumnHandlePos", _firstColHandlePos); - viewSettings.setValue("SecondColumnHandlePos", _secondColHandlePos); - ChatViewSettings defaultSettings; defaultSettings.setValue("FirstColumnHandlePos", _firstColHandlePos); + + // clock_t startT = clock(); + + // disabling the index while doing this complex updates is about + // 2 to 10 times faster! + //setItemIndexMethod(QGraphicsScene::NoIndex); + + QList::iterator lineIter = _lines.end(); + QList::iterator lineIterBegin = _lines.begin(); + qreal timestampWidth = firstColumnHandle()->sceneLeft(); + qreal senderWidth = secondColumnHandle()->sceneLeft() - firstColumnHandle()->sceneRight(); + QPointF senderPos(firstColumnHandle()->sceneRight(), 0); + + while(lineIter != lineIterBegin) { + lineIter--; + (*lineIter)->setFirstColumn(timestampWidth, senderWidth, senderPos); + } + //setItemIndexMethod(QGraphicsScene::BspTreeIndex); + + setHandleXLimits(); + +// clock_t endT = clock(); +// qDebug() << "resized" << _lines.count() << "in" << (float)(endT - startT) / CLOCKS_PER_SEC << "sec"; +} + +void ChatScene::secondHandlePositionChanged(qreal xpos) { + if(_secondColHandlePos == xpos) + return; + + _secondColHandlePos = xpos; + ChatViewSettings viewSettings(this); + viewSettings.setValue("SecondColumnHandlePos", _secondColHandlePos); + ChatViewSettings defaultSettings; defaultSettings.setValue("SecondColumnHandlePos", _secondColHandlePos); - setWidth(width(), true); // readjust all chatlines - // we get ugly redraw errors if we don't update this explicitly... :( - // width() should be the same for both handles, so just use _firstColHandle regardless - //update(qMin(oldx, xpos), 0, qMax(oldx, xpos) + firstColHandle->width(), height()); + // clock_t startT = clock(); + + // disabling the index while doing this complex updates is about + // 2 to 10 times faster! + //setItemIndexMethod(QGraphicsScene::NoIndex); + + QList::iterator lineIter = _lines.end(); + QList::iterator lineIterBegin = _lines.begin(); + qreal linePos = _sceneRect.y() + _sceneRect.height(); + qreal senderWidth = secondColumnHandle()->sceneLeft() - firstColumnHandle()->sceneRight(); + qreal contentsWidth = _sceneRect.width() - secondColumnHandle()->sceneRight(); + QPointF contentsPos(secondColumnHandle()->sceneRight(), 0); + while(lineIter != lineIterBegin) { + lineIter--; + (*lineIter)->setSecondColumn(senderWidth, contentsWidth, contentsPos, linePos); + } + //setItemIndexMethod(QGraphicsScene::BspTreeIndex); + + setHandleXLimits(); + +// clock_t endT = clock(); +// qDebug() << "resized" << _lines.count() << "in" << (float)(endT - startT) / CLOCKS_PER_SEC << "sec"; } void ChatScene::setHandleXLimits() { @@ -506,18 +526,10 @@ QString ChatScene::selectionToString() const { } void ChatScene::requestBacklog() { - static const int REQUEST_COUNT = 500; - int backlogSize = model()->rowCount(); - if(isSingleBufferScene() && backlogSize != 0 && _lastBacklogSize + REQUEST_COUNT <= backlogSize) { - QModelIndex msgIdx = model()->index(0, 0); - while((Message::Type)(model()->data(msgIdx, ChatLineModel::TypeRole).toInt()) == Message::DayChange) { - msgIdx = msgIdx.sibling(msgIdx.row() + 1, 0); - } - MsgId msgId = model()->data(msgIdx, ChatLineModel::MsgIdRole).value(); - BufferId bufferId = model()->data(msgIdx, ChatLineModel::BufferIdRole).value(); - _lastBacklogSize = backlogSize; - Client::backlogManager()->requestBacklog(bufferId, REQUEST_COUNT, msgId.toInt()); - } + MessageFilter *filter = qobject_cast(model()); + if(filter) + return filter->requestBacklog(); + return; } int ChatScene::sectionByScenePos(int x) { @@ -529,9 +541,9 @@ int ChatScene::sectionByScenePos(int x) { return ChatLineModel::ContentsColumn; } -void ChatScene::updateSceneRect() { +void ChatScene::updateSceneRect(qreal width) { if(_lines.isEmpty()) { - updateSceneRect(QRectF(0, 0, _sceneRect.width(), 0)); + updateSceneRect(QRectF(0, 0, width, 0)); return; } @@ -554,14 +566,14 @@ void ChatScene::updateSceneRect() { } // the following call should be safe. If it crashes something went wrong during insert/remove - 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())); -} - -void ChatScene::updateSceneRect(qreal width) { - _sceneRect.setWidth(width); - updateSceneRect(); + if(_firstLineRow < _lines.count()) { + ChatLine *firstLine = _lines.at(_firstLineRow); + ChatLine *lastLine = _lines.last(); + updateSceneRect(QRectF(0, firstLine->pos().y(), width, lastLine->pos().y() + lastLine->height() - firstLine->pos().y())); + } else { + // empty scene rect + updateSceneRect(QRectF(0, 0, width, 0)); + } } void ChatScene::updateSceneRect(const QRectF &rect) { @@ -570,11 +582,12 @@ void ChatScene::updateSceneRect(const QRectF &rect) { update(); } -void ChatScene::customEvent(QEvent *event) { - switch(event->type()) { - default: - return; +bool ChatScene::event(QEvent *e) { + if(e->type() == QEvent::ApplicationPaletteChange) { + _firstColHandle->setColor(QApplication::palette().windowText().color()); + _secondColHandle->setColor(QApplication::palette().windowText().color()); } + return QGraphicsScene::event(e); } void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const QRectF &urlRect) {