X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=03c0e5f9b68bab103dffc347824b209b161ae8e2;hp=67ce63c6ea8037e9d700864c9b5b0578acfbae91;hb=2749b14904e18f1de05be66ccc1ebdadd57e838f;hpb=a787e8b6e8dd5357531fa89d22da95ebf987469c diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index 67ce63c6..03c0e5f9 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -36,32 +36,21 @@ const qreal minContentsWidth = 200; -ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, QObject *parent) - : QGraphicsScene(parent), +ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal width, QObject *parent) + : QGraphicsScene(0, 0, width, 0, parent), _idString(idString), - _width(0), - _height(0), _model(model), _singleBufferScene(false), _selectingItem(0), _selectionStart(-1), - _isSelecting(false) + _isSelecting(false), + _lastBacklogSize(0) { MessageFilter *filter = qobject_cast(model); if(filter) { _singleBufferScene = filter->isSingleBufferFilter(); } - 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())); - for(int i = 0; i < model->rowCount(); i++) { - ChatLine *line = new ChatLine(i, model); - _lines.append(line); - addItem(line); - } - QtUiSettings s; int defaultFirstColHandlePos = s.value("ChatView/DefaultFirstColumnHandlePos", 80).toInt(); int defaultSecondColHandlePos = s.value("ChatView/DefaultSecondColumnHandlePos", 200).toInt(); @@ -71,41 +60,64 @@ 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); + firstColHandle->setXPos(firstColHandlePos); connect(firstColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal))); - connect(secondColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal))); + connect(this, SIGNAL(sceneRectChanged(const QRectF &)), firstColHandle, SLOT(sceneRectChanged(const QRectF &))); - firstColHandle->setXPos(firstColHandlePos); - firstColHandle->setXLimits(0, secondColHandlePos); + secondColHandle = new ColumnHandleItem(QtUi::style()->secondColumnSeparator()); + addItem(secondColHandle); secondColHandle->setXPos(secondColHandlePos); - secondColHandle->setXLimits(firstColHandlePos, width() - minContentsWidth); + connect(secondColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal))); + connect(this, SIGNAL(sceneRectChanged(const QRectF &)), secondColHandle, SLOT(sceneRectChanged(const QRectF &))); - emit heightChanged(height()); + setHandleXLimits(); + + 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))); + + if(model->rowCount() > 0) + rowsInserted(QModelIndex(), 0, model->rowCount() - 1); } ChatScene::~ChatScene() { - } void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { Q_UNUSED(index); - // maybe make this more efficient by prepending stuff with negative yval - // dunno if that's worth not guranteeing that 0 is on the top... - // 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(); - for(int i = start; i <= end; i++) { + 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(); + atTop = false; + } + if(start == _lines.count()) + atBottom = true; + + for(int i = end; i >= start; i--) { ChatLine *line = new ChatLine(i, model()); - _lines.insert(i, line); + _lines.insert(start, line); addItem(line); - if(_width > 0) { - line->setPos(0, y+h); - h += line->setGeometry(_width, firstColHandlePos, secondColHandlePos); + 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 for(int i = end+1; i < _lines.count(); i++) { _lines[i]->setRow(i); @@ -120,41 +132,125 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { if(_lastSelectionRow >= start) _lastSelectionRow += offset; } - if(h > 0) { - _height += h; - for(int i = end+1; i < _lines.count(); i++) { - _lines.value(i)->moveBy(0, h); + // neither pre- or append means we have to do dirty work: move items... + if(!(atTop || atBottom)) { + qreal offset = h; + int moveStart = 0; + int moveEnd = _lines.count() - 1; + ChatLine *line = 0; + if(end > _lines.count() - end) { + // move top part + moveTop = true; + offset = -offset; + moveEnd = end; + } else { + // move bottom part + moveStart = start; } - setSceneRect(QRectF(0, 0, _width, _height)); - emit heightChanged(_height); + for(int i = moveStart; i <= moveEnd; i++) { + line = _lines.at(i); + line->setPos(0, line->pos().y() + offset); + } + } + + // update sceneRect + if(atTop || moveTop) { + setSceneRect(sceneRect().adjusted(0, h, 0, 0)); + } else { + setSceneRect(sceneRect().adjusted(0, 0, 0, h)); + emit sceneHeightChanged(h); } + } -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; + + bool atTop = (start == 0); + bool atBottom = (end == _lines.count() - 1); + bool moveTop = false; + + // 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++; } - _lines.clear(); - setSceneRect(QRectF(0, 0, _width, 0)); - emit heightChanged(0); + + // 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; + } + + // neither removing at bottom or top means we have to move items... + if(!(atTop || atBottom)) { + qreal offset = h; + int moveStart = 0; + int moveEnd = _lines.count() - 1; + ChatLine *line = 0; + if(start > _lines.count() - end) { + // move top part + moveTop = true; + moveEnd = start - 1; + } else { + // move bottom part + moveStart = start; + offset = -offset; + } + for(int i = moveStart; i <= moveEnd; i++) { + line = _lines.at(i); + line->setPos(0, line->pos().y() + offset); + } + } + + // update sceneRect + if(atTop || moveTop) { + setSceneRect(sceneRect().adjusted(0, h, 0, 0)); + } else { + setSceneRect(sceneRect().adjusted(0, 0, 0, -h)); + } + } -void ChatScene::setWidth(qreal w) { - _width = w; - _height = 0; +void ChatScene::setWidth(qreal width, bool 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, _height); - _height += line->setGeometry(_width, firstColHandlePos, secondColHandlePos); + line->setPos(0, linePos); + linePos += line->setGeometry(width); } - setSceneRect(QRectF(0, 0, w, _height)); - secondColHandle->setXLimits(firstColHandlePos, width() - minContentsWidth); - emit heightChanged(_height); -} -void ChatScene::rectChanged(const QRectF &rect) { - firstColHandle->sceneRectChanged(rect); - secondColHandle->sceneRectChanged(rect); + qreal height = linePos - y; + + setSceneRect(QRectF(0, y, width, height)); + setHandleXLimits(); + + qreal dh = height - oldHeight; + if(dh > 0) + emit sceneHeightChanged(dh); } void ChatScene::handlePositionChanged(qreal xpos) { @@ -173,10 +269,15 @@ void ChatScene::handlePositionChanged(qreal xpos) { s.setValue(QString("ChatView/DefaultFirstColumnHandlePos"), firstColHandlePos); s.setValue(QString("ChatView/DefaultSecondColumnHandlePos"), secondColHandlePos); - setWidth(width()); // readjust all chatlines + 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) - 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) { @@ -195,12 +296,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; @@ -235,10 +336,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 +361,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 +421,9 @@ void ChatScene::requestBacklog() { } 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;