Disabling SceneIndex during resizing.

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

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index 7db1f17..cbdc59d 100644 (file)
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -22,6 +22,7 @@
 #include <QClipboard>
 #include <QGraphicsSceneMouseEvent>
 #include <QPersistentModelIndex>
+#include <QWebView>
 
 #include "chatitem.h"
 #include "chatline.h"
@@ -38,11 +39,6 @@
 
 const qreal minContentsWidth = 200;
 
-class ClearWebPreviewEvent : public QEvent {
-public:
-  inline ClearWebPreviewEvent() : QEvent(QEvent::User) {}
-};
-
 ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal width, QObject *parent)
   : QGraphicsScene(0, 0, width, 0, parent),
     _idString(idString),
@@ -91,8 +87,12 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w
   if(model->rowCount() > 0)
     rowsInserted(QModelIndex(), 0, model->rowCount() - 1);
 
+#ifdef HAVE_WEBKIT
   webPreview.delayTimer.setSingleShot(true);
-  connect(&webPreview.delayTimer, SIGNAL(timeout()), this, SLOT(showWebPreview()));
+  connect(&webPreview.delayTimer, SIGNAL(timeout()), this, SLOT(showWebPreviewEvent()));
+  webPreview.deleteTimer.setInterval(600000);
+  connect(&webPreview.deleteTimer, SIGNAL(timeout()), this, SLOT(deleteWebPreviewEvent()));
+#endif
 }
 
 ChatScene::~ChatScene() {
@@ -188,6 +188,10 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
     }
   }
 
+  // check if all went right
+  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());
+
   if(!atBottom) {
     if(start < _firstLineRow) {
       int prevFirstLineRow = _firstLineRow + (end - start + 1);
@@ -199,10 +203,9 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
     _firstLineRow = -1;
   }
   updateSceneRect();
-  if(atBottom) {
-    emit lastLineChanged(_lines.last());
+  if(atBottom || (!atTop && !moveTop)) {
+    emit lastLineChanged(_lines.last(), h);
   }
-
 }
 
 void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
@@ -263,6 +266,8 @@ 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());
 
   // update sceneRect
   // when searching for the first non-date-line we have to take into account that our
@@ -301,6 +306,10 @@ void ChatScene::setWidth(qreal width, bool forceReposition) {
 
 //   clock_t startT = clock();
 
+  // disabling the index while doing this complex updates is about
+  // 2 to 10 times faster!
+  setItemIndexMethod(QGraphicsScene::NoIndex);
+
   qreal linePos = _sceneRect.y() + _sceneRect.height();
   QList<ChatLine *>::iterator lineIter = _lines.end();
   QList<ChatLine *>::iterator lineIterBegin = _lines.begin();
@@ -329,6 +338,7 @@ void ChatScene::setWidth(qreal width, bool forceReposition) {
       line->setPos(0, linePos);
     }
   }
+  setItemIndexMethod(QGraphicsScene::BspTreeIndex);
 
   updateSceneRect(width);
   setHandleXLimits();
@@ -557,14 +567,14 @@ void ChatScene::updateSceneRect(qreal width) {
 void ChatScene::updateSceneRect(const QRectF &rect) {
   _sceneRect = rect;
   setSceneRect(rect);
+  update();
 }
 
 void ChatScene::customEvent(QEvent *event) {
-  if(event->type() != QEvent::User)
+  switch(event->type()) {
+  default:
     return;
-
-  event->accept();
-  clearWebPreviewEvent();
+  }
 }
 
 void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const QRectF &urlRect) {
@@ -579,12 +589,17 @@ void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const Q
   if(webPreview.url != url) {
     webPreview.url = url;
     // load a new web view and delete the old one (if exists)
-    if(webPreview.previewItem) {
+    if(webPreview.previewItem && webPreview.previewItem->scene()) {
       removeItem(webPreview.previewItem);
       delete webPreview.previewItem;
     }
     webPreview.previewItem = new WebPreviewItem(url);
     webPreview.delayTimer.start(2000);
+    webPreview.deleteTimer.stop();
+  } else if(webPreview.previewItem && !webPreview.previewItem->scene()) {
+      // we just have to readd the item to the scene
+      webPreview.delayTimer.start(2000);
+      webPreview.deleteTimer.stop();
   }
   if(webPreview.urlRect != urlRect) {
     webPreview.urlRect = urlRect;
@@ -601,30 +616,30 @@ void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const Q
 #endif
 }
 
+void ChatScene::showWebPreviewEvent() {
+#ifdef HAVE_WEBKIT
+  if(webPreview.previewItem)
+    addItem(webPreview.previewItem);
+#endif
+}
+
 void ChatScene::clearWebPreview(ChatItem *parentItem) {
 #ifndef HAVE_WEBKIT
   Q_UNUSED(parentItem)
 #else
   if(parentItem == 0 || webPreview.parentItem == parentItem) {
-    // posting an event ensures that the item will not be removed as
-    // the result of another event. this could result in bad segfaults
-    QCoreApplication::postEvent(this, new ClearWebPreviewEvent());
+    if(webPreview.previewItem && webPreview.previewItem->scene()) {
+      removeItem(webPreview.previewItem);
+      webPreview.deleteTimer.start();
+    }
+    webPreview.delayTimer.stop();
   }
 #endif
 }
 
-void ChatScene::showWebPreview() {
-#ifdef HAVE_WEBKIT
-  if(webPreview.previewItem)
-    addItem(webPreview.previewItem);
-#endif
-}
-
-void ChatScene::clearWebPreviewEvent() {
+void ChatScene::deleteWebPreviewEvent() {
 #ifdef HAVE_WEBKIT
   if(webPreview.previewItem) {
-    if(webPreview.previewItem->scene())
-      removeItem(webPreview.previewItem);
     delete webPreview.previewItem;
     webPreview.previewItem = 0;
   }