projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finally fixing the WebPreview crash bug. As a result BspTreeIndexing has been reenabled.
[quassel.git]
/
src
/
qtui
/
chatscene.cpp
diff --git
a/src/qtui/chatscene.cpp
b/src/qtui/chatscene.cpp
index
67415cc
..
d02bfc6
100644
(file)
--- a/
src/qtui/chatscene.cpp
+++ b/
src/qtui/chatscene.cpp
@@
-22,6
+22,7
@@
#include <QClipboard>
#include <QGraphicsSceneMouseEvent>
#include <QPersistentModelIndex>
#include <QClipboard>
#include <QGraphicsSceneMouseEvent>
#include <QPersistentModelIndex>
+#include <QWebView>
#include "chatitem.h"
#include "chatline.h"
#include "chatitem.h"
#include "chatline.h"
@@
-38,9
+39,9
@@
const qreal minContentsWidth = 200;
const qreal minContentsWidth = 200;
-class ClearWebPreviewEvent : public QEvent {
+class C
hatScene::C
learWebPreviewEvent : public QEvent {
public:
public:
- inline ClearWebPreviewEvent() : QEvent(
QEvent::User
) {}
+ inline ClearWebPreviewEvent() : QEvent(
(QEvent::Type)ChatScene::ClearWebPreviewEventType
) {}
};
ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal width, QObject *parent)
};
ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal width, QObject *parent)
@@
-93,6
+94,8
@@
ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w
webPreview.delayTimer.setSingleShot(true);
connect(&webPreview.delayTimer, SIGNAL(timeout()), this, SLOT(showWebPreview()));
webPreview.delayTimer.setSingleShot(true);
connect(&webPreview.delayTimer, SIGNAL(timeout()), this, SLOT(showWebPreview()));
+ webPreview.deleteTimer.setInterval(600000);
+ connect(&webPreview.deleteTimer, SIGNAL(timeout()), this, SLOT(deleteWebPreview()));
}
ChatScene::~ChatScene() {
}
ChatScene::~ChatScene() {
@@
-188,6
+191,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);
if(!atBottom) {
if(start < _firstLineRow) {
int prevFirstLineRow = _firstLineRow + (end - start + 1);
@@
-202,7
+209,6
@@
void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
if(atBottom || (!atTop && !moveTop)) {
emit lastLineChanged(_lines.last(), h);
}
if(atBottom || (!atTop && !moveTop)) {
emit lastLineChanged(_lines.last(), h);
}
-
}
void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
}
void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
@@
-263,6
+269,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
// update sceneRect
// when searching for the first non-date-line we have to take into account that our
@@
-557,14
+565,17
@@
void ChatScene::updateSceneRect(qreal width) {
void ChatScene::updateSceneRect(const QRectF &rect) {
_sceneRect = rect;
setSceneRect(rect);
void ChatScene::updateSceneRect(const QRectF &rect) {
_sceneRect = rect;
setSceneRect(rect);
+ update();
}
void ChatScene::customEvent(QEvent *event) {
}
void ChatScene::customEvent(QEvent *event) {
- if(event->type() != QEvent::User)
+ switch(event->type()) {
+ case ClearWebPreviewEventType:
+ clearWebPreviewEvent((ClearWebPreviewEvent *)event);
+ break;
+ default:
return;
return;
-
- event->accept();
- clearWebPreviewEvent();
+ }
}
void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const QRectF &urlRect) {
}
void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const QRectF &urlRect) {
@@
-579,12
+590,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.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);
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;
}
if(webPreview.urlRect != urlRect) {
webPreview.urlRect = urlRect;
@@
-620,17
+636,23
@@
void ChatScene::showWebPreview() {
#endif
}
#endif
}
-void ChatScene::clearWebPreviewEvent() {
+void ChatScene::clearWebPreviewEvent(
ClearWebPreviewEvent *event
) {
#ifdef HAVE_WEBKIT
#ifdef HAVE_WEBKIT
+ event->accept();
+ if(webPreview.previewItem && webPreview.previewItem->scene()) {
+ removeItem(webPreview.previewItem);
+ webPreview.deleteTimer.start();
+ }
+ webPreview.delayTimer.stop();
+#endif
+}
+
+void ChatScene::deleteWebPreview() {
if(webPreview.previewItem) {
if(webPreview.previewItem) {
- if(webPreview.previewItem->scene()) {
- removeItem(webPreview.previewItem);
- }
delete webPreview.previewItem;
webPreview.previewItem = 0;
}
webPreview.parentItem = 0;
webPreview.url = QString();
webPreview.urlRect = QRectF();
delete webPreview.previewItem;
webPreview.previewItem = 0;
}
webPreview.parentItem = 0;
webPreview.url = QString();
webPreview.urlRect = QRectF();
-#endif
}
}