X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=c24933a280fdf0f41bc07ad5ed5f842553422655;hp=1adea58f37ba56ee9bd826c974fcdb0b1d890264;hb=954b1a6f53da55f9713fb4e75a2fb46dae7d9df8;hpb=c902a2a58671e7d145f5e879d87100844bd20df4;ds=sidebyside diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index 1adea58f..c24933a2 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -93,6 +93,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 +268,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 @@ -303,7 +304,7 @@ void ChatScene::setWidth(qreal width) { // disabling the index while doing this complex updates is about // 2 to 10 times faster! - setItemIndexMethod(QGraphicsScene::NoIndex); + //setItemIndexMethod(QGraphicsScene::NoIndex); QList::iterator lineIter = _lines.end(); QList::iterator lineIterBegin = _lines.begin(); @@ -313,7 +314,7 @@ void ChatScene::setWidth(qreal width) { lineIter--; (*lineIter)->setGeometryByWidth(width, contentsWidth, linePos); } - setItemIndexMethod(QGraphicsScene::BspTreeIndex); + //setItemIndexMethod(QGraphicsScene::BspTreeIndex); updateSceneRect(width); setHandleXLimits(); @@ -336,7 +337,7 @@ void ChatScene::firstHandlePositionChanged(qreal xpos) { // disabling the index while doing this complex updates is about // 2 to 10 times faster! - setItemIndexMethod(QGraphicsScene::NoIndex); + //setItemIndexMethod(QGraphicsScene::NoIndex); QList::iterator lineIter = _lines.end(); QList::iterator lineIterBegin = _lines.begin(); @@ -348,7 +349,7 @@ void ChatScene::firstHandlePositionChanged(qreal xpos) { lineIter--; (*lineIter)->setFirstColumn(timestampWidth, senderWidth, senderPos); } - setItemIndexMethod(QGraphicsScene::BspTreeIndex); + //setItemIndexMethod(QGraphicsScene::BspTreeIndex); setHandleXLimits(); @@ -370,7 +371,7 @@ void ChatScene::secondHandlePositionChanged(qreal xpos) { // disabling the index while doing this complex updates is about // 2 to 10 times faster! - setItemIndexMethod(QGraphicsScene::NoIndex); + //setItemIndexMethod(QGraphicsScene::NoIndex); QList::iterator lineIter = _lines.end(); QList::iterator lineIterBegin = _lines.begin(); @@ -382,7 +383,7 @@ void ChatScene::secondHandlePositionChanged(qreal xpos) { lineIter--; (*lineIter)->setSecondColumn(senderWidth, contentsWidth, contentsPos, linePos); } - setItemIndexMethod(QGraphicsScene::BspTreeIndex); + //setItemIndexMethod(QGraphicsScene::BspTreeIndex); setHandleXLimits(); @@ -572,9 +573,14 @@ void ChatScene::updateSceneRect(qreal width) { } // 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(), width, lastLine->pos().y() + lastLine->height() - firstLine->pos().y())); + 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) {