X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=6c54f7c75bea7f0299dc760769da63c9b2981075;hb=7ddbb98e280034b3bd42f568919e0c6cc5b5e06e;hp=3a87e87fbeddd13e6903936e16a82a7ea9b0f60c;hpb=70ededc490cb201e52b6d8ca4c2364d4a001b6c4;p=quassel.git

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index 3a87e87f..6c54f7c7 100644
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -32,7 +32,7 @@
 #include "columnhandleitem.h"
 #include "messagefilter.h"
 #include "qtui.h"
-#include "qtuisettings.h"
+#include "chatviewsettings.h"
 
 const qreal minContentsWidth = 200;
 
@@ -41,6 +41,7 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w
     _idString(idString),
     _model(model),
     _singleBufferScene(false),
+    _sceneRect(0, 0, width, 0),
     _selectingItem(0),
     _selectionStart(-1),
     _isSelecting(false),
@@ -51,14 +52,13 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w
     _singleBufferScene = filter->isSingleBufferFilter();
   }
 
-  QtUiSettings s;
-  int defaultFirstColHandlePos = s.value("ChatView/DefaultFirstColumnHandlePos", 80).toInt();
-  int defaultSecondColHandlePos = s.value("ChatView/DefaultSecondColumnHandlePos", 200).toInt();
+  ChatViewSettings defaultSettings;
+  int defaultFirstColHandlePos = defaultSettings.value("FirstColumnHandlePos", 80).toInt();
+  int defaultSecondColHandlePos = defaultSettings.value("SecondColumnHandlePos", 200).toInt();
 
-  firstColHandlePos = s.value(QString("ChatView/%1/FirstColumnHandlePos").arg(_idString),
-                               defaultFirstColHandlePos).toInt();
-  secondColHandlePos = s.value(QString("ChatView/%1/SecondColumnHandlePos").arg(_idString),
-                                defaultSecondColHandlePos).toInt();
+  ChatViewSettings viewSettings(this);
+  firstColHandlePos = viewSettings.value("FirstColumnHandlePos", defaultFirstColHandlePos).toInt();
+  secondColHandlePos = viewSettings.value("SecondColumnHandlePos", defaultSecondColHandlePos).toInt();
 
   firstColHandle = new ColumnHandleItem(QtUi::style()->firstColumnSeparator());
   addItem(firstColHandle);
@@ -89,10 +89,11 @@ ChatScene::~ChatScene() {
 void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
   Q_UNUSED(index);
   qreal h = 0;
-  qreal y = sceneRect().y();
-  qreal width = sceneRect().width();
+  qreal y = _sceneRect.y();
+  qreal width = _sceneRect.width();
   bool atTop = true;
   bool atBottom = false;
+  bool moveTop = false;
   bool hasWidth = (width != 0);
 
   if(start > 0) {
@@ -102,9 +103,6 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
   if(start == _lines.count())
     atBottom = true;
 
-  // right now this method doesn't properly handle messages that are inserted at an arbitrary point
-  Q_ASSERT(atBottom || atTop);
-
   for(int i = end; i >= start; i--) {
     ChatLine *line = new ChatLine(i, model());
     _lines.insert(start, line);
@@ -125,13 +123,44 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
     _lines[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 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;
+    }
+    for(int i = moveStart; i <= moveEnd; i++) {
+      line = _lines.at(i);
+      line->setPos(0, line->pos().y() + offset);
+    }
+  }
+  
   // update sceneRect
-  if(atBottom) {
-    setSceneRect(sceneRect().adjusted(0, 0, 0, h));
-    emit sceneHeightChanged(h);
+  if(atTop || moveTop) {
+    updateSceneRect(_sceneRect.adjusted(0, h, 0, 0));
   } else {
-    setSceneRect(sceneRect().adjusted(0, h, 0, 0));
+    updateSceneRect(_sceneRect.adjusted(0, 0, 0, h));
+    emit sceneHeightChanged(h);
   }
+
 }
 
 void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
@@ -141,9 +170,7 @@ void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e
 
   bool atTop = (start == 0);
   bool atBottom = (end == _lines.count() - 1);
-
-  // right now this method doesn't properly handle messages that are removed at an arbitrary point
-  Q_ASSERT(atBottom || atTop);
+  bool moveTop = false;
 
   // remove items from scene
   QList<ChatLine *>::iterator lineIter = _lines.begin() + start;
@@ -160,20 +187,55 @@ void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e
     _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(atBottom) {
-    setSceneRect(sceneRect().adjusted(0, 0, 0, -h));
+  if(atTop || moveTop) {
+    updateSceneRect(_sceneRect.adjusted(0, h, 0, 0));
   } else {
-    setSceneRect(sceneRect().adjusted(0, h, 0, 0));
+    updateSceneRect(_sceneRect.adjusted(0, 0, 0, -h));
   }
 }
 
 void ChatScene::setWidth(qreal width, bool forceReposition) {
-  if(width == sceneRect().width() && !forceReposition)
+  if(width == _sceneRect.width() && !forceReposition)
     return;
 
-  qreal oldHeight = sceneRect().height();
-  qreal y = sceneRect().y();
+  // clock_t startT = clock();
+  qreal oldHeight = _sceneRect.height();
+  qreal y = _sceneRect.y();
   qreal linePos = y;
 
   foreach(ChatLine *line, _lines) {
@@ -183,12 +245,15 @@ void ChatScene::setWidth(qreal width, bool forceReposition) {
 
   qreal height = linePos - y;
 
-  setSceneRect(QRectF(0, y, width, height));
+  updateSceneRect(QRectF(0, y, width, height));
   setHandleXLimits();
 
   qreal dh = height - oldHeight;
   if(dh > 0)
     emit sceneHeightChanged(dh);
+
+  // clock_t endT = clock();
+  // qDebug() << "resized" << _lines.count() << "in" << (float)(endT - startT) / CLOCKS_PER_SEC << "sec";
 }
 
 void ChatScene::handlePositionChanged(qreal xpos) {
@@ -201,11 +266,14 @@ void ChatScene::handlePositionChanged(qreal xpos) {
     oldx = secondColHandlePos;
     secondColHandlePos = xpos;
   }
-  QtUiSettings s;
-  s.setValue(QString("ChatView/%1/FirstColumnHandlePos").arg(_idString), firstColHandlePos);
-  s.setValue(QString("ChatView/%1/SecondColumnHandlePos").arg(_idString), secondColHandlePos);
-  s.setValue(QString("ChatView/DefaultFirstColumnHandlePos"), firstColHandlePos);
-  s.setValue(QString("ChatView/DefaultSecondColumnHandlePos"), secondColHandlePos);
+
+  ChatViewSettings viewSettings(this);
+  viewSettings.setValue("FirstColumnHandlePos", firstColHandlePos);
+  viewSettings.setValue("SecondColumnHandlePos", secondColHandlePos);
+
+  ChatViewSettings defaultSettings;
+  defaultSettings.setValue("FirstColumnHandlePos", firstColHandlePos);
+  defaultSettings.setValue("SecondColumnHandlePos", secondColHandlePos);
 
   setWidth(width(), true);  // readjust all chatlines
   // we get ugly redraw errors if we don't update this explicitly... :(
@@ -214,8 +282,8 @@ void ChatScene::handlePositionChanged(qreal xpos) {
 }
 
 void ChatScene::setHandleXLimits() {
-  firstColHandle->setXLimits(0, secondColumnHandleRect().left());
-  secondColHandle->setXLimits(firstColumnHandleRect().right(), width() - minContentsWidth);
+  firstColHandle->setXLimits(0, secondColHandle->sceneLeft());
+  secondColHandle->setXLimits(firstColHandle->sceneRight(), width() - minContentsWidth);
 }
 
 void ChatScene::setSelectingItem(ChatItem *item) {
@@ -234,12 +302,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<ChatItem *>(itemAt(QPointF(secondColumnHandleRect().right() + 1, pos.y())));
+  ChatItem *contentItem = static_cast<ChatItem *>(itemAt(QPointF(secondColHandle->sceneRight() + 1, pos.y())));
   if(!contentItem) return;
 
   int curRow = contentItem->row();
   int curColumn;
-  if(pos.x() > secondColumnHandleRect().right()) curColumn = ChatLineModel::ContentsColumn;
+  if(pos.x() > secondColHandle->sceneRight()) curColumn = ChatLineModel::ContentsColumn;
   else if(pos.x() > firstColHandlePos) curColumn = ChatLineModel::SenderColumn;
   else curColumn = ChatLineModel::TimestampColumn;
 
@@ -347,7 +415,7 @@ QString ChatScene::selectionToString() const {
 }
 
 void ChatScene::requestBacklog() {
-  static const int REQUEST_COUNT = 50;
+  static const int REQUEST_COUNT = 100;
   int backlogSize = model()->rowCount();
   if(isSingleBufferScene() && backlogSize != 0 && _lastBacklogSize + REQUEST_COUNT <= backlogSize) {
     QModelIndex msgIdx = model()->index(0, 0);
@@ -366,3 +434,8 @@ int ChatScene::sectionByScenePos(int x) {
 
   return ChatLineModel::ContentsColumn;
 }
+
+void ChatScene::updateSceneRect(const QRectF &rect) {
+  _sceneRect = rect;
+  setSceneRect(rect);
+}