X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=1bee955617b4b02207b98d287942bc6438f4e098;hp=ed8e68d2947551d02fb75c04cd2f5cc58a9a9a06;hb=348384bd80c0896b665d807763d8d837e3b1fb3d;hpb=176d22d49934223b9279719ac5d9e7c03e530d40

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index ed8e68d2..1bee9556 100644
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -34,6 +34,7 @@
 #include "qtui.h"
 #include "qtuistyle.h"
 #include "chatviewsettings.h"
+#include "webpreviewitem.h"
 
 const qreal minContentsWidth = 200;
 
@@ -90,6 +91,13 @@ ChatScene::~ChatScene() {
 
 void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
   Q_UNUSED(index);
+
+  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();
@@ -97,12 +105,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();
@@ -110,20 +121,14 @@ 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);
-    } else {
-      line->setPos(0, y+h);
-      h += line->height();
-    }
-    _lines.insert(start, line);
+    line->setPos(0, y+h);
+    h += line->height();
+    _lines.insert(i, line);
     addItem(line);
   }
 
@@ -146,8 +151,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;
@@ -156,6 +162,7 @@ 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);
@@ -164,7 +171,7 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
 
   // update sceneRect
   if(atTop || moveTop) {
-    updateSceneRect(_sceneRect.adjusted(0, h, 0, 0));
+    updateSceneRect(_sceneRect.adjusted(0, -h, 0, 0));
   } else {
     updateSceneRect(_sceneRect.adjusted(0, 0, 0, h));
     emit lastLineChanged(_lines.last());
@@ -175,6 +182,8 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
 void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
   Q_UNUSED(parent);
 
+  clearWebPreview();
+
   qreal h = 0; // total height of removed items;
 
   bool atTop = (start == 0);
@@ -214,8 +223,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;
@@ -224,6 +232,7 @@ 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);
@@ -454,6 +463,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;
@@ -474,3 +486,55 @@ void ChatScene::updateSceneRect(const QRectF &rect) {
   _sceneRect = rect;
   setSceneRect(rect);
 }
+
+
+void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const QRectF &urlRect) {
+#ifndef HAVE_WEBKIT
+  Q_UNUSED(parentItem)
+  Q_UNUSED(url)
+  Q_UNUSED(urlRect)
+#else
+  if(webPreview.parentItem != parentItem)
+    webPreview.parentItem = parentItem;
+
+  if(webPreview.url != url) {
+    webPreview.url = url;
+    // load a new web view and delete the old one (if exists)
+    if(webPreview.previewItem) {
+      removeItem(webPreview.previewItem);
+      delete webPreview.previewItem;
+    }
+    webPreview.previewItem = new WebPreviewItem(url);
+    addItem(webPreview.previewItem);
+  }
+  if(webPreview.urlRect != urlRect) {
+    webPreview.urlRect = urlRect;
+    qreal previewY = urlRect.bottom();
+    qreal previewX = urlRect.x();
+    if(previewY + webPreview.previewItem->boundingRect().height() > sceneRect().bottom())
+      previewY = urlRect.y() - webPreview.previewItem->boundingRect().height();
+
+    if(previewX + webPreview.previewItem->boundingRect().width() > sceneRect().width())
+      previewX = sceneRect().right() - webPreview.previewItem->boundingRect().width();
+
+    webPreview.previewItem->setPos(previewX, previewY);
+  }
+#endif
+}
+
+void ChatScene::clearWebPreview(ChatItem *parentItem) {
+#ifndef HAVE_WEBKIT
+  Q_UNUSED(parentItem)
+#else
+  if(parentItem == 0 || webPreview.parentItem == parentItem) {
+    if(webPreview.previewItem) {
+      removeItem(webPreview.previewItem);
+      delete webPreview.previewItem;
+      webPreview.previewItem = 0;
+    }
+    webPreview.parentItem = 0;
+    webPreview.url = QString();
+    webPreview.urlRect = QRectF();
+  }
+#endif
+}