ChatScene speed improvement. This might even fix the dreaded CPU bug!

[quassel.git] / src / qtui / chatscene.cpp

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index 4b2bf5c..f9f7b17 100644 (file)
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -55,7 +55,7 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w
   int defaultFirstColHandlePos = defaultSettings.value("FirstColumnHandlePos", 80).toInt();
   int defaultSecondColHandlePos = defaultSettings.value("SecondColumnHandlePos", 200).toInt();
 
-  ChatViewSettings viewSettings(idString);
+  ChatViewSettings viewSettings(this);
   firstColHandlePos = viewSettings.value("FirstColumnHandlePos", defaultFirstColHandlePos).toInt();
   secondColHandlePos = viewSettings.value("SecondColumnHandlePos", defaultSecondColHandlePos).toInt();
 
@@ -233,6 +233,7 @@ void ChatScene::setWidth(qreal width, bool forceReposition) {
   if(width == sceneRect().width() && !forceReposition)
     return;
 
+  // clock_t startT = clock();
   qreal oldHeight = sceneRect().height();
   qreal y = sceneRect().y();
   qreal linePos = y;
@@ -250,6 +251,9 @@ void ChatScene::setWidth(qreal width, bool forceReposition) {
   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) {
@@ -263,7 +267,7 @@ void ChatScene::handlePositionChanged(qreal xpos) {
     secondColHandlePos = xpos;
   }
 
-  ChatViewSettings viewSettings(idString());
+  ChatViewSettings viewSettings(this);
   viewSettings.setValue("FirstColumnHandlePos", firstColHandlePos);
   viewSettings.setValue("SecondColumnHandlePos", secondColHandlePos);
 
@@ -278,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) {
@@ -298,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;
 
@@ -411,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);