X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=20c5478524a1a2a9f16efa8b4d9cda403b83f80a;hp=1adea58f37ba56ee9bd826c974fcdb0b1d890264;hb=33fe0cafca3a17123e7b4a3f93910f688983c0b1;hpb=c902a2a58671e7d145f5e879d87100844bd20df4

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index 1adea58f..20c54785 100644
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -47,10 +47,10 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w
     _sceneRect(0, 0, width, 0),
     _firstLineRow(-1),
     _viewportHeight(0),
+    _cutoffMode(CutoffRight),
     _selectingItem(0),
     _selectionStart(-1),
-    _isSelecting(false),
-    _lastBacklogSize(0)
+    _isSelecting(false)
 {
   MessageFilter *filter = qobject_cast<MessageFilter*>(model);
   if(filter) {
@@ -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<ChatLine *>::iterator lineIter = _lines.end();
   QList<ChatLine *>::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<ChatLine *>::iterator lineIter = _lines.end();
   QList<ChatLine *>::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<ChatLine *>::iterator lineIter = _lines.end();
   QList<ChatLine *>::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();
 
@@ -524,18 +525,10 @@ QString ChatScene::selectionToString() const {
 }
 
 void ChatScene::requestBacklog() {
-  static const int REQUEST_COUNT = 500;
-  int backlogSize = model()->rowCount();
-  if(isSingleBufferScene() && backlogSize != 0 && _lastBacklogSize + REQUEST_COUNT <= backlogSize) {
-    QModelIndex msgIdx = model()->index(0, 0);
-    while((Message::Type)(model()->data(msgIdx, ChatLineModel::TypeRole).toInt()) == Message::DayChange) {
-      msgIdx = msgIdx.sibling(msgIdx.row() + 1, 0);
-    }
-    MsgId msgId = model()->data(msgIdx, ChatLineModel::MsgIdRole).value<MsgId>();
-    BufferId bufferId = model()->data(msgIdx, ChatLineModel::BufferIdRole).value<BufferId>();
-    _lastBacklogSize = backlogSize;
-    Client::backlogManager()->requestBacklog(bufferId, REQUEST_COUNT, msgId.toInt());
-  }
+  MessageFilter *filter = qobject_cast<MessageFilter*>(model());
+  if(filter)
+    return filter->requestBacklog();
+  return;
 }
 
 int ChatScene::sectionByScenePos(int x) {
@@ -572,9 +565,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) {