X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=358eb12b9ad095828694142e3ecfebc39c0b3843;hp=8d3eed482204cbba6acb7d6d34f5c7baea0f2c9b;hb=62317a70eef06212a1afcfcc1df5b18853d8ef01;hpb=31745736b8b31647f6224c5a3fe9e82e0320f0f1 diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index 8d3eed48..358eb12b 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -81,9 +81,9 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w setHandleXLimits(); connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), - this, SLOT(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))); + this, SLOT(rowsAboutToBeRemoved(const QModelIndex &, int, int))); if(model->rowCount() > 0) rowsInserted(QModelIndex(), 0, model->rowCount() - 1); @@ -146,9 +146,9 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { if(atTop) { for(int i = end; i >= start; i--) { ChatLine *line = new ChatLine(i, model(), - width, - timestampWidth, senderWidth, contentsWidth, - senderPos, contentsPos); + width, + timestampWidth, senderWidth, contentsWidth, + senderPos, contentsPos); h += line->height(); line->setPos(0, y-h); _lines.insert(start, line); @@ -157,9 +157,9 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { } else { for(int i = start; i <= end; i++) { ChatLine *line = new ChatLine(i, model(), - width, - timestampWidth, senderWidth, contentsWidth, - senderPos, contentsPos); + width, + timestampWidth, senderWidth, contentsWidth, + senderPos, contentsPos); line->setPos(0, y+h); h += line->height(); _lines.insert(i, line); @@ -237,7 +237,7 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { if(start < _firstLineRow) { int prevFirstLineRow = _firstLineRow + (end - start + 1); for(int i = end + 1; i < prevFirstLineRow; i++) { - _lines.at(i)->show(); + _lines.at(i)->show(); } } // force new search for first proper line @@ -513,6 +513,15 @@ void ChatScene::updateSelection(const QPointF &pos) { } } +bool ChatScene::isScrollingAllowed() const { + if(_isSelecting) + return false; + + // TODO: Handle clicks and single-item selections too + + return true; +} + void ChatScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { if(_isSelecting && event->buttons() == Qt::LeftButton) { updateSelection(event->scenePos()); @@ -611,7 +620,7 @@ void ChatScene::updateSceneRect(qreal width) { while(_firstLineRow < numRows) { firstLineIdx = model()->index(_firstLineRow, 0); if((Message::Type)(model()->data(firstLineIdx, MessageModel::TypeRole).toInt()) != Message::DayChange) - break; + break; _lines.at(_firstLineRow)->hide(); _firstLineRow++; }