X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=b7355fd163285ed9488d89509e0c521b12210051;hp=67ce63c6ea8037e9d700864c9b5b0578acfbae91;hb=15c352c7ae1ea3d0884d8dc641b7d642a51179fd;hpb=a787e8b6e8dd5357531fa89d22da95ebf987469c diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index 67ce63c6..b7355fd1 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -45,7 +45,8 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, QObject _singleBufferScene(false), _selectingItem(0), _selectionStart(-1), - _isSelecting(false) + _isSelecting(false), + _lastBacklogSize(0) { MessageFilter *filter = qobject_cast(model); if(filter) { @@ -54,8 +55,11 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, QObject connect(this, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(rectChanged(const QRectF &))); - connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(rowsInserted(const QModelIndex &, int, int))); - connect(model, SIGNAL(modelAboutToBeReset()), this, SLOT(modelReset())); + connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), + this, SLOT(rowsInserted(const QModelIndex &, int, int))); + connect(model, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)), + this, SLOT(rowsAboutToBeRemoved(const QModelIndex &, int, int))); + for(int i = 0; i < model->rowCount(); i++) { ChatLine *line = new ChatLine(i, model); _lines.append(line); @@ -71,22 +75,23 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, QObject secondColHandlePos = s.value(QString("ChatView/%1/SecondColumnHandlePos").arg(_idString), defaultSecondColHandlePos).toInt(); - firstColHandle = new ColumnHandleItem(QtUi::style()->firstColumnSeparator()); addItem(firstColHandle); - secondColHandle = new ColumnHandleItem(QtUi::style()->secondColumnSeparator()); addItem(secondColHandle); + firstColHandle = new ColumnHandleItem(QtUi::style()->firstColumnSeparator()); + addItem(firstColHandle); + + secondColHandle = new ColumnHandleItem(QtUi::style()->secondColumnSeparator()); + addItem(secondColHandle); connect(firstColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal))); connect(secondColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal))); firstColHandle->setXPos(firstColHandlePos); - firstColHandle->setXLimits(0, secondColHandlePos); secondColHandle->setXPos(secondColHandlePos); - secondColHandle->setXLimits(firstColHandlePos, width() - minContentsWidth); + setHandleXLimits(); emit heightChanged(height()); } ChatScene::~ChatScene() { - } void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { @@ -96,7 +101,9 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { // TODO bulk inserts, iterators qreal h = 0; qreal y = 0; - if(_width && start > 0) y = _lines.value(start - 1)->y() + _lines.value(start - 1)->height(); + if(_width && start > 0) + y = _lines.value(start - 1)->y() + _lines.value(start - 1)->height(); + for(int i = start; i <= end; i++) { ChatLine *line = new ChatLine(i, model()); _lines.insert(i, line); @@ -123,21 +130,56 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { if(h > 0) { _height += h; for(int i = end+1; i < _lines.count(); i++) { - _lines.value(i)->moveBy(0, h); + _lines.at(i)->moveBy(0, h); } setSceneRect(QRectF(0, 0, _width, _height)); emit heightChanged(_height); } } -void ChatScene::modelReset() { - foreach(ChatLine *line, _lines) { - removeItem(line); - delete line; +void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) { + Q_UNUSED(parent); + + qreal h = 0; // total height of removed items; + + // remove items from scene + QList::iterator lineIter = _lines.begin() + start; + int lineCount = start; + while(lineIter != _lines.end() && lineCount <= end) { + h += (*lineIter)->height(); + delete *lineIter; + lineIter = _lines.erase(lineIter); + lineCount++; + } + + // update rows of remaining chatlines + for(int i = start; i < _lines.count(); i++) { + _lines.at(i)->setRow(i); + } + + // update selection + if(_selectionStart >= 0) { + int offset = end - start + 1; + if(_selectionStart >= start) + _selectionStart -= offset; + if(_selectionEnd >= start) + _selectionEnd -= offset; + if(_firstSelectionRow >= start) + _firstSelectionRow -= offset; + if(_lastSelectionRow >= start) + _lastSelectionRow -= offset; + } + + // reposition remaining chatlines + if(h > 0) { + Q_ASSERT(_height >= h); + _height -= h; + for(int i = start; i < _lines.count(); i++) { + _lines.at(i)->moveBy(0, -h); + } + setSceneRect(QRectF(0, 0, _width, _height)); + emit heightChanged(_height); } - _lines.clear(); - setSceneRect(QRectF(0, 0, _width, 0)); - emit heightChanged(0); } void ChatScene::setWidth(qreal w) { @@ -148,7 +190,7 @@ void ChatScene::setWidth(qreal w) { _height += line->setGeometry(_width, firstColHandlePos, secondColHandlePos); } setSceneRect(QRectF(0, 0, w, _height)); - secondColHandle->setXLimits(firstColHandlePos, width() - minContentsWidth); + setHandleXLimits(); emit heightChanged(_height); } @@ -176,7 +218,14 @@ void ChatScene::handlePositionChanged(qreal xpos) { setWidth(width()); // 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) - firstColHandle->width()/2, 0, qMax(oldx, xpos) + firstColHandle->width()/2, height()); + update(qMin(oldx, xpos), 0, qMax(oldx, xpos) + firstColHandle->width(), height()); +} + +void ChatScene::setHandleXLimits() { + qreal firstsepwidth = QtUi::style()->firstColumnSeparator(); + qreal secondsepwidth = QtUi::style()->secondColumnSeparator(); + firstColHandle->setXLimits(-firstsepwidth/2, secondColHandlePos - firstsepwidth/2); + secondColHandle->setXLimits(firstColHandlePos + firstsepwidth - secondsepwidth/2, width() - minContentsWidth - secondsepwidth/2); } void ChatScene::setSelectingItem(ChatItem *item) { @@ -195,7 +244,7 @@ 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(secondColHandlePos + secondColHandle->width()/2, pos.y()))); + ChatItem *contentItem = static_cast(itemAt(QPointF(secondColHandlePos + secondColHandle->width(), pos.y()))); if(!contentItem) return; int curRow = contentItem->row(); @@ -235,10 +284,12 @@ void ChatScene::updateSelection(const QPointF &pos) { _lastSelectionRow = curRow; if(newstart == newend && minColumn == ChatLineModel::ContentsColumn) { + if(!_selectingItem) { + qWarning() << "WARNING: ChatScene::updateSelection() has a null _selectingItem, this should never happen! Please report."; + return; + } _lines[curRow]->setSelected(false); _isSelecting = false; - Q_ASSERT(_selectingItem); // this seems to not always be true, but I have no idea why - // adding this assert to make sure the occasional segfault is caused by this _selectingItem->continueSelecting(_selectingItem->mapFromScene(pos)); } } @@ -258,7 +309,7 @@ void ChatScene::mousePressEvent(QGraphicsSceneMouseEvent *event) { _lines[l]->setSelected(false); } _selectionStart = -1; - event->accept(); + QGraphicsScene::mousePressEvent(event); // so we can start a new local selection } else { QGraphicsScene::mousePressEvent(event); } @@ -318,9 +369,9 @@ void ChatScene::requestBacklog() { } int ChatScene::sectionByScenePos(int x) { - if(x < firstColHandlePos) + if(x < firstColHandlePos + firstColHandle->width()/2) return ChatLineModel::TimestampColumn; - if(x < secondColHandlePos) + if(x < secondColHandlePos + secondColHandle->width()/2) return ChatLineModel::SenderColumn; return ChatLineModel::ContentsColumn;