X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatitem.cpp;h=21829c2f956888f2e72b4668dd3ebd865e892597;hp=072ae1b08419da6b13e4800375613d37b3572ae9;hb=8363ea72ebe41a3ce582a7ea460d50be8cb9f337;hpb=339ed024e6cf074108e39360e7db58ea0961761b diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp index 072ae1b0..21829c2f 100644 --- a/src/qtui/chatitem.cpp +++ b/src/qtui/chatitem.cpp @@ -26,10 +26,6 @@ #include #include #include -#ifdef HAVE_WEBKIT -#include -#endif -#include #include "chatitem.h" #include "chatlinemodel.h" @@ -61,7 +57,7 @@ QVariant ChatItem::data(int role) const { return model()->data(index, role); } -QTextLayout *ChatItem::createLayout(QTextOption::WrapMode wrapMode, Qt::Alignment alignment) { +QTextLayout *ChatItem::createLayout(QTextOption::WrapMode wrapMode, Qt::Alignment alignment) const { QTextLayout *layout = new QTextLayout(data(MessageModel::DisplayRole).toString()); QTextOption option; @@ -75,10 +71,7 @@ QTextLayout *ChatItem::createLayout(QTextOption::WrapMode wrapMode, Qt::Alignmen return layout; } -void ChatItem::updateLayout() { - if(!privateData()) { - setPrivateData(new ChatItemPrivate(createLayout())); - } +void ChatItem::doLayout() { QTextLayout *layout_ = layout(); layout_->beginLayout(); QTextLine line = layout_->createLine(); @@ -94,12 +87,19 @@ void ChatItem::clearLayout() { _data = 0; } +ChatItemPrivate *ChatItem::privateData() const { + if(!_data) { + ChatItem *that = const_cast(this); + that->_data = that->newPrivateData(); + that->doLayout(); + } + return _data; +} + // NOTE: This is not the most time-efficient implementation, but it saves space by not caching unnecessary data // This is a deliberate trade-off. (-> selectFmt creation, data() call) void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { Q_UNUSED(option); Q_UNUSED(widget); - if(!hasLayout()) - updateLayout(); painter->setClipRect(boundingRect()); // no idea why QGraphicsItem clipping won't work //if(_selectionMode == FullSelection) { //painter->save(); @@ -123,27 +123,36 @@ void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, layout()->draw(painter, QPointF(0,0), formats, boundingRect()); // Debuging Stuff - // uncomment the following lines to draw the bounding rect and the row number in alternating colors + // uncomment partially or all of the following stuff: + // + // 0) alternativ painter color for debug stuff // if(row() % 2) // painter->setPen(Qt::red); // else // painter->setPen(Qt::blue); -// QString rowString = QString::number(row()); -// QRect rowRect = painter->fontMetrics().boundingRect(rowString); -// QPointF topPoint = _boundingRect.topLeft(); -// topPoint.ry() += rowRect.height(); -// painter->drawText(topPoint, rowString); -// QPointF bottomPoint = _boundingRect.bottomRight(); -// bottomPoint.rx() -= rowRect.width(); -// painter->drawText(bottomPoint, rowString); + // 1) draw wordwrap points in the first line +// if(column() == 2) { +// ChatLineModel::WrapList wrapList = data(ChatLineModel::WrapListRole).value(); +// foreach(ChatLineModel::Word word, wrapList) { +// if(word.endX > width()) +// break; +// painter->drawLine(word.endX, 0, word.endX, height()); +// } +// } + // 2) draw MsgId over the time column +// if(column() == 0) { +// QString msgIdString = QString::number(data(MessageModel::MsgIdRole).value().toInt()); +// QPointF bottomPoint = boundingRect().bottomLeft(); +// bottomPoint.ry() -= 2; +// painter->drawText(bottomPoint, msgIdString); +// } + // 3) draw bounding rect // painter->drawRect(_boundingRect.adjusted(0, 0, -1, -1)); } qint16 ChatItem::posToCursor(const QPointF &pos) { if(pos.y() > height()) return data(MessageModel::DisplayRole).toString().length(); if(pos.y() < 0) return 0; - if(!hasLayout()) - updateLayout(); for(int l = layout()->lineCount() - 1; l >= 0; l--) { QTextLine line = layout()->lineAt(l); if(pos.y() >= line.y()) { @@ -185,9 +194,7 @@ QList ChatItem::findWords(const QString &searchWord, Qt::CaseSensitivity searchIdx = plainText.indexOf(searchWord, searchIdx + 1, caseSensitive); } - bool hadLayout = hasLayout(); - if(!hadLayout) - updateLayout(); + bool hadPrivateData = hasPrivateData(); foreach(int idx, indexList) { QTextLine line = layout()->lineForTextPosition(idx); @@ -198,7 +205,7 @@ QList ChatItem::findWords(const QString &searchWord, Qt::CaseSensitivity resultList << QRectF(x, y, width, height); } - if(!hadLayout) + if(!hadPrivateData) clearLayout(); return resultList; } @@ -265,6 +272,7 @@ ContentsChatItem::ContentsChatItem(const qreal &width, const QPointF &pos, QGrap qreal ContentsChatItem::setGeometryByWidth(qreal w) { if(w != width()) { + prepareGeometryChange(); setWidth(w); // compute height int lines = 1; @@ -276,13 +284,7 @@ qreal ContentsChatItem::setGeometryByWidth(qreal w) { return height(); } -void ContentsChatItem::updateLayout() { - if(!privateData()) { - ContentsChatItemPrivate *data = new ContentsChatItemPrivate(createLayout(QTextOption::WrapAnywhere), findClickables(), this); - setPrivateData(data); - } - - // Now layout +void ContentsChatItem::doLayout() { ChatLineModel::WrapList wrapList = data(ChatLineModel::WrapListRole).value(); if(!wrapList.count()) return; // empty chatitem @@ -304,19 +306,19 @@ void ContentsChatItem::updateLayout() { // NOTE: This method is not threadsafe and not reentrant! // (RegExps are not constant while matching, and they are static here for efficiency) -QList ContentsChatItem::findClickables() { +QList ContentsChatItem::findClickables() const { // For matching URLs static QString urlEnd("(?:>|[,.;:\"]*\\s|\\b|$)"); - static QString urlChars("(?:[\\w\\-~@/?&=+$()!%#]|[,.;:]\\w)"); + static QString urlChars("(?:[,.;:]*[\\w\\-~@/?&=+$()!%#])"); static QRegExp regExp[] = { // URL // QRegExp(QString("((?:https?://|s?ftp://|irc://|mailto:|www\\.)%1+|%1+\\.[a-z]{2,4}(?:?=/%1+|\\b))%2").arg(urlChars, urlEnd)), - QRegExp(QString("((?:(?:https?://|s?ftp://|irc://|mailto:)|www)%1+)%2").arg(urlChars, urlEnd)), + QRegExp(QString("((?:(?:https?://|s?ftp://|irc://|mailto:)|www)%1+)%2").arg(urlChars, urlEnd), Qt::CaseInsensitive), // Channel name // We don't match for channel names starting with + or &, because that gives us a lot of false positives. - QRegExp("((?:#|![A-Z0-9]{5})[^,:\\s]+(?::[^,:\\s]+)?)\\b") + QRegExp("((?:#|![A-Z0-9]{5})[^,:\\s]+(?::[^,:\\s]+)?)\\b", Qt::CaseInsensitive) // TODO: Nicks, we'll need a filtering for only matching known nicknames further down if we do this }; @@ -380,14 +382,12 @@ QVector ContentsChatItem::additionalFormats() const { } void ContentsChatItem::endHoverMode() { - if(hasLayout()) { + if(hasPrivateData()) { if(privateData()->currentClickable.isValid()) { setCursor(Qt::ArrowCursor); privateData()->currentClickable = Clickable(); } -#ifdef HAVE_WEBKIT clearWebPreview(); -#endif update(); } } @@ -424,7 +424,7 @@ void ContentsChatItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { // mouse move events always mean we're not hovering anymore... endHoverMode(); // also, check if we have dragged the mouse - if(hasLayout() && !privateData()->hasDragged && event->buttons() & Qt::LeftButton + if(hasPrivateData() && !privateData()->hasDragged && event->buttons() & Qt::LeftButton && (event->buttonDownScreenPos(Qt::LeftButton) - event->screenPos()).manhattanLength() >= QApplication::startDragDistance()) privateData()->hasDragged = true; ChatItem::mouseMoveEvent(event); @@ -443,9 +443,7 @@ void ContentsChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { if(idx >= click.start && idx < click.start + click.length) { if(click.type == Clickable::Url) { onClickable = true; -#ifdef HAVE_WEBKIT showWebPreview(click); -#endif } else if(click.type == Clickable::Channel) { // TODO: don't make clickable if it's our own name //onClickable = true; //FIXME disabled for now @@ -462,106 +460,29 @@ void ContentsChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { event->accept(); } -#ifdef HAVE_WEBKIT void ContentsChatItem::showWebPreview(const Clickable &click) { - if(!hasLayout()) - updateLayout(); - +#ifdef HAVE_WEBKIT QTextLine line = layout()->lineForTextPosition(click.start); qreal x = line.cursorToX(click.start); qreal width = line.cursorToX(click.start + click.length) - x; qreal height = line.height(); qreal y = height * line.lineNumber(); - QRectF urlRect(x, y, width, height); + + QPointF topLeft = scenePos() + QPointF(x, y); + QRectF urlRect = QRectF(topLeft.x(), topLeft.y(), width, height); + QString url = data(ChatLineModel::DisplayRole).toString().mid(click.start, click.length); if(!url.contains("://")) url = "http://" + url; - privateData()->loadWebPreview(url, urlRect); + chatScene()->loadWebPreview(this, url, urlRect); +#endif } void ContentsChatItem::clearWebPreview() { - if(hasLayout()) - privateData()->clearWebPreview(); -} -#endif - -// **************************************** -// ContentsChatItemPrivate -// **************************************** #ifdef HAVE_WEBKIT -ContentsChatItemPrivate::~ContentsChatItemPrivate() { - clearWebPreview(); -} - -void ContentsChatItemPrivate::loadWebPreview(const QString &url, const QRectF &urlRect) { - if(url != previewUrl) { - previewUrl = url; - // load a new web view and delete the old one (if exists) - if(previewItem) { - contentsItem->scene()->removeItem(previewItem); - delete previewItem; - } - QWebView *view = new QWebView; - view->load(url); - previewItem = new ContentsChatItemPrivate::PreviewItem(view); - contentsItem->scene()->addItem(previewItem); - } - if(urlRect != previewUrlRect) { - previewUrlRect = urlRect; - QPointF sPos = contentsItem->scenePos(); - qreal previewY = sPos.y() + urlRect.y() + urlRect.height(); // bottom of url; - qreal previewX = sPos.x() + urlRect.x(); - if(previewY + previewItem->boundingRect().height() > contentsItem->scene()->sceneRect().bottom()) - previewY = sPos.y() + urlRect.y() - previewItem->boundingRect().height(); - - if(previewX + previewItem->boundingRect().width() > contentsItem->scene()->sceneRect().width()) - previewX = contentsItem->scene()->sceneRect().right() - previewItem->boundingRect().width(); - - previewItem->setPos(previewX, previewY); - } -} - -void ContentsChatItemPrivate::clearWebPreview() { - if(previewItem) { - contentsItem->scene()->removeItem(previewItem); - delete previewItem; - previewItem = 0; - } - previewUrl = QString(); - previewUrlRect = QRectF(); -} - -ContentsChatItemPrivate::PreviewItem::PreviewItem(QWebView *webView) - : QGraphicsItem(0), // needs to be a top level item as we otherwise cannot guarantee that it's on top of other chatlines - _boundingRect(0, 0, 400, 300) -{ - qreal frameWidth = 5; - webView->resize(1000, 750); - QGraphicsProxyWidget *proxyItem = new QGraphicsProxyWidget(this); - proxyItem->setWidget(webView); - proxyItem->setAcceptHoverEvents(false); - - qreal xScale = (_boundingRect.width() - 2 * frameWidth) / webView->width(); - qreal yScale = (_boundingRect.height() - 2 * frameWidth) / webView->height(); - proxyItem->scale(xScale, yScale); - proxyItem->setPos(frameWidth, frameWidth); - - setZValue(30); -} - -void ContentsChatItemPrivate::PreviewItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - Q_UNUSED(option); Q_UNUSED(widget); - painter->setClipRect(boundingRect()); - painter->setPen(QPen(Qt::black, 5)); - painter->setBrush(Qt::black); - painter->setRenderHints(QPainter::Antialiasing); - painter->drawRoundedRect(boundingRect(), 10, 10); - - painter->setPen(QPen(Qt::green)); - QString text = QString::number(zValue()); - painter->drawText(_boundingRect.center(), text); + chatScene()->clearWebPreview(this); +#endif } -#endif // #ifdef HAVE_WEBKIT /*************************************************************************************************/