X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=b5dd4528cb26e5c01544130c0b67e0638012f96c;hp=e99509e1a1f91761e06d222083f7dc19ca43cc69;hb=d77cc962c2bc0de9e6288020804842ffe116f838;hpb=17b8c981d7c47800392b7fd1c043c5ac1bcb19ef

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index e99509e1..b5dd4528 100644
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -44,6 +44,7 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w
     _model(model),
     _singleBufferScene(false),
     _sceneRect(0, 0, width, 0),
+    _firstLineRow(-1),
     _viewportHeight(0),
     _selectingItem(0),
     _selectionStart(-1),
@@ -94,6 +95,10 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
 
   clearWebPreview();
 
+//   QModelIndex sidx = model()->index(start, 0);
+//   QModelIndex eidx = model()->index(end, 0);
+//   qDebug() << "rowsInserted" << start << end << "-" << sidx.data(MessageModel::MsgIdRole).value<MsgId>() << eidx.data(MessageModel::MsgIdRole).value<MsgId>();
+
   qreal h = 0;
   qreal y = _sceneRect.y();
   qreal width = _sceneRect.width();
@@ -101,12 +106,15 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
   bool atBottom = false;
   bool moveTop = false;
 
-  if(start > 0) {
-    y = _lines.value(start - 1)->y() + _lines.value(start - 1)->height();
+  if(start > 0 && start < _lines.count()) {
+    y = _lines.value(start)->y();
     atTop = false;
   }
-  if(start == _lines.count())
+  if(start == _lines.count()) {
+    y = _sceneRect.bottom();
+    atTop = false;
     atBottom = true;
+  }
 
   qreal contentsWidth = width - secondColumnHandle()->sceneRight();
   qreal senderWidth = secondColumnHandle()->sceneLeft() - firstColumnHandle()->sceneRight();
@@ -114,20 +122,19 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
   QPointF contentsPos(secondColumnHandle()->sceneRight(), 0);
   QPointF senderPos(firstColumnHandle()->sceneRight(), 0);
 
-
-  for(int i = end; i >= start; i--) {
+  for(int i = start; i <= end; i++) {
     ChatLine *line = new ChatLine(i, model(),
 				  width,
 				  timestampWidth, senderWidth, contentsWidth,
 				  senderPos, contentsPos);
     if(atTop) {
-      h -= line->height();
-      line->setPos(0, y+h);
+      h += line->height();
+      line->setPos(0, y-h);
     } else {
       line->setPos(0, y+h);
       h += line->height();
     }
-    _lines.insert(start, line);
+    _lines.insert(i, line);
     addItem(line);
   }
 
@@ -150,8 +157,9 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
     qreal offset = h;
     int moveStart = 0;
     int moveEnd = _lines.count() - 1;
-    ChatLine *line = 0;
-    if(end > _lines.count() - end) {
+    // move top means: moving 0 to end (aka: end + 1)
+    // move top means: moving end + 1 to _lines.count() - 1 (aka: _lines.count() - (end + 1)
+    if(end + 1 < _lines.count() - end - 1) {
       // move top part
       moveTop = true;
       offset = -offset;
@@ -160,17 +168,25 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
       // move bottom part
       moveStart = start;
     }
+    ChatLine *line = 0;
     for(int i = moveStart; i <= moveEnd; i++) {
       line = _lines.at(i);
       line->setPos(0, line->pos().y() + offset);
     }
   }
 
-  // update sceneRect
-  if(atTop || moveTop) {
-    updateSceneRect(_sceneRect.adjusted(0, h, 0, 0));
-  } else {
-    updateSceneRect(_sceneRect.adjusted(0, 0, 0, h));
+  if(!atBottom) {
+    if(start < _firstLineRow) {
+      int prevFirstLineRow = _firstLineRow + (end - start + 1);
+      for(int i = end + 1; i < prevFirstLineRow; i++) {
+	_lines.at(i)->show();
+      }
+    }
+    // force new search for first proper line
+    _firstLineRow = -1;
+  }
+  updateSceneRect();
+  if(atBottom) {
     emit lastLineChanged(_lines.last());
   }
 
@@ -220,8 +236,7 @@ void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e
     qreal offset = h;
     int moveStart = 0;
     int moveEnd = _lines.count() - 1;
-    ChatLine *line = 0;
-    if(start > _lines.count() - end) {
+    if(start < _lines.count() - start) {
       // move top part
       moveTop = true;
       moveEnd = start - 1;
@@ -230,18 +245,33 @@ void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e
       moveStart = start;
       offset = -offset;
     }
+    ChatLine *line = 0;
     for(int i = moveStart; i <= moveEnd; i++) {
       line = _lines.at(i);
       line->setPos(0, line->pos().y() + offset);
     }
   }
 
+
   // update sceneRect
-  if(atTop || moveTop) {
-    updateSceneRect(_sceneRect.adjusted(0, h, 0, 0));
-  } else {
-    updateSceneRect(_sceneRect.adjusted(0, 0, 0, -h));
-  }
+  // when searching for the first non-date-line we have to take into account that our
+  // model still contains the just removed lines so we cannot simply call updateSceneRect()
+  int numRows = model()->rowCount();
+  QModelIndex firstLineIdx;
+  _firstLineRow = -1;
+  bool needOffset = false;
+  do {
+    _firstLineRow++;
+    if(_firstLineRow >= start && _firstLineRow <= end) {
+      _firstLineRow = end + 1;
+      needOffset = true;
+    }
+    firstLineIdx = model()->index(_firstLineRow, 0);
+  } while((Message::Type)(model()->data(firstLineIdx, MessageModel::TypeRole).toInt()) == Message::DayChange && _firstLineRow < numRows);
+
+  if(needOffset)
+    _firstLineRow -= end - start + 1;
+  updateSceneRect();
 }
 
 void ChatScene::updateForViewport(qreal width, qreal height) {
@@ -261,7 +291,6 @@ void ChatScene::setWidth(qreal width, bool forceReposition) {
 //   clock_t startT = clock();
 
   qreal linePos = _sceneRect.y() + _sceneRect.height();
-  qreal yBottom = linePos;
   QList<ChatLine *>::iterator lineIter = _lines.end();
   QList<ChatLine *>::iterator lineIterBegin = _lines.begin();
   ChatLine *line = 0;
@@ -290,7 +319,7 @@ void ChatScene::setWidth(qreal width, bool forceReposition) {
     }
   }
 
-  updateSceneRect(QRectF(0, linePos, width, yBottom - linePos));
+  updateSceneRect(width);
   setHandleXLimits();
 
 //   clock_t endT = clock();
@@ -460,6 +489,9 @@ void ChatScene::requestBacklog() {
   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;
@@ -476,6 +508,41 @@ int ChatScene::sectionByScenePos(int x) {
   return ChatLineModel::ContentsColumn;
 }
 
+void ChatScene::updateSceneRect() {
+  if(_lines.isEmpty()) {
+    updateSceneRect(QRectF(0, 0, _sceneRect.width(), 0));
+    return;
+  }
+
+  // we hide day change messages at the top by making the scene rect smaller
+  // and by calling QGraphicsItem::hide() on all leading day change messages
+  // the first one is needed to ensure proper scrollbar ranges
+  // the second for cases where the viewport is larger then the set scenerect
+  //  (in this case the items are shown anyways)
+  if(_firstLineRow == -1) {
+    int numRows = model()->rowCount();
+    _firstLineRow = 0;
+    QModelIndex firstLineIdx;
+    while(_firstLineRow < numRows) {
+      firstLineIdx = model()->index(_firstLineRow, 0);
+      if((Message::Type)(model()->data(firstLineIdx, MessageModel::TypeRole).toInt()) != Message::DayChange)
+	break;
+      _lines.at(_firstLineRow)->hide();
+      _firstLineRow++;
+    }
+  }
+
+  // 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(), _sceneRect.width(), lastLine->pos().y() + lastLine->height() - firstLine->pos().y()));
+}
+
+void ChatScene::updateSceneRect(qreal width) {
+  _sceneRect.setWidth(width);
+  updateSceneRect();
+}
+
 void ChatScene::updateSceneRect(const QRectF &rect) {
   _sceneRect = rect;
   setSceneRect(rect);