X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=5f6032c60a075fac4aa349e236b1a94120fddc79;hb=bcb94767ec585a25b83bfb7a4e236fb40cc32570;hp=681996a55cec169b75d76c8f52a91ea49fb29d95;hpb=7ce0cf6c209c30b1b8702e6623cb6d6d6cad822d;p=quassel.git diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index 681996a5..5f6032c6 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -46,7 +46,7 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, QObject _selectingItem(0), _selectionStart(-1), _isSelecting(false), - _fetchingBacklog(false) + _lastBacklogSize(0) { MessageFilter *filter = qobject_cast(model); if(filter) { @@ -55,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); @@ -72,22 +75,24 @@ 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()); + emit heightChangedAt(0, height()); } ChatScene::~ChatScene() { - } void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { @@ -97,14 +102,16 @@ 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); addItem(line); if(_width > 0) { line->setPos(0, y+h); - h += line->setGeometry(_width, firstColHandlePos, secondColHandlePos); + h += line->setGeometry(_width); } } // update existing items @@ -124,35 +131,73 @@ 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); + emit heightChangedAt(_lines.at(start)->y(), h); } - - requestBacklogIfNeeded(); } -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); + emit heightChangedAt(_lines.at(start)->y(), -h); } - _lines.clear(); - setSceneRect(QRectF(0, 0, _width, 0)); - emit heightChanged(0); } void ChatScene::setWidth(qreal w) { + qreal oldh = _height; _width = w; _height = 0; foreach(ChatLine *line, _lines) { line->setPos(0, _height); - _height += line->setGeometry(_width, firstColHandlePos, secondColHandlePos); + _height += line->setGeometry(_width); } setSceneRect(QRectF(0, 0, w, _height)); - secondColHandle->setXLimits(firstColHandlePos, width() - minContentsWidth); + setHandleXLimits(); emit heightChanged(_height); + emit heightChangedAt(0, _height - oldh); + } void ChatScene::rectChanged(const QRectF &rect) { @@ -179,7 +224,12 @@ 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() { + firstColHandle->setXLimits(0, secondColumnHandleRect().left()); + secondColHandle->setXLimits(firstColumnHandleRect().right(), width() - minContentsWidth); } void ChatScene::setSelectingItem(ChatItem *item) { @@ -198,12 +248,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(secondColHandlePos + secondColHandle->width()/2, pos.y()))); + ChatItem *contentItem = static_cast(itemAt(QPointF(secondColumnHandleRect().right() + 1, pos.y()))); if(!contentItem) return; int curRow = contentItem->row(); int curColumn; - if(pos.x() > secondColHandlePos + secondColHandle->width()/2) curColumn = ChatLineModel::ContentsColumn; + if(pos.x() > secondColumnHandleRect().right()) curColumn = ChatLineModel::ContentsColumn; else if(pos.x() > firstColHandlePos) curColumn = ChatLineModel::SenderColumn; else curColumn = ChatLineModel::TimestampColumn; @@ -238,10 +288,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)); } } @@ -261,7 +313,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); } @@ -308,34 +360,22 @@ QString ChatScene::selectionToString() const { return result; } -void ChatScene::setIsFetchingBacklog(bool fetch) { - if(!isBacklogFetchingEnabled()) return; - - if(!fetch) { - _fetchingBacklog = false; - } else { - _fetchingBacklog = true; - requestBacklogIfNeeded(); - } -} - -void ChatScene::requestBacklogIfNeeded() { - const int REQUEST_COUNT = 50; - - if(!isBacklogFetchingEnabled() || !isFetchingBacklog() || !model()->rowCount()) return; - - MsgId msgId = model()->data(model()->index(0, 0), ChatLineModel::MsgIdRole).value(); - if(!_lastBacklogOffset.isValid() || (msgId < _lastBacklogOffset && _lastBacklogSize + REQUEST_COUNT <= model()->rowCount())) { - Client::backlogManager()->requestBacklog(bufferForBacklogFetching(), REQUEST_COUNT, msgId.toInt()); - _lastBacklogOffset = msgId; - _lastBacklogSize = model()->rowCount(); +void ChatScene::requestBacklog() { + static const int REQUEST_COUNT = 50; + int backlogSize = model()->rowCount(); + if(isSingleBufferScene() && backlogSize != 0 && _lastBacklogSize + REQUEST_COUNT <= backlogSize) { + QModelIndex msgIdx = model()->index(0, 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()); } } int ChatScene::sectionByScenePos(int x) { - if(x < firstColHandlePos) + if(x < firstColHandle->x()) return ChatLineModel::TimestampColumn; - if(x < secondColHandlePos) + if(x < secondColHandle->x()) return ChatLineModel::SenderColumn; return ChatLineModel::ContentsColumn;