X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatitem.cpp;h=5e2942cc712c7c4f98b8dbf09c148301d4f5ff41;hp=390e428aa9549c885ae153138c2dcf3a9607516e;hb=d45d1044c030312878cb648fd1325ce70b079c44;hpb=00f633d013c9c9b87ae811c62daca40c1f73d1b8 diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp index 390e428a..5e2942cc 100644 --- a/src/qtui/chatitem.cpp +++ b/src/qtui/chatitem.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 by the Quassel Project * + * Copyright (C) 2005-2010 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -31,22 +31,64 @@ #include "buffermodel.h" #include "bufferview.h" #include "chatitem.h" +#include "chatline.h" #include "chatlinemodel.h" +#include "chatview.h" #include "contextmenuactionprovider.h" #include "iconloader.h" #include "mainwin.h" #include "qtui.h" #include "qtuistyle.h" -ChatItem::ChatItem(const qreal &width, const qreal &height, const QPointF &pos, QGraphicsItem *parent) - : QGraphicsItem(parent), - _boundingRect(0, 0, width, height), - _selectionMode(NoSelection), - _selectionStart(-1) +ChatItem::ChatItem(const QRectF &boundingRect, ChatLine *parent) +: _parent(parent), + _boundingRect(boundingRect), + _selectionMode(NoSelection), + _selectionStart(-1), + _cachedLayout(0) { - setAcceptHoverEvents(true); - setZValue(20); - setPos(pos); + +} + +ChatItem::~ChatItem() { + delete _cachedLayout; +} + +ChatLine *ChatItem::chatLine() const { + return _parent; +} + +ChatScene *ChatItem::chatScene() const { + return chatLine()->chatScene(); +} + +ChatView *ChatItem::chatView() const { + return chatScene()->chatView(); +} + +const QAbstractItemModel *ChatItem::model() const { + return chatLine()->model(); +} + +int ChatItem::row() const { + return chatLine()->row(); +} + +QPointF ChatItem::mapToLine(const QPointF &p) const { + return p + pos(); +} + +QPointF ChatItem::mapFromLine(const QPointF &p) const { + return p - pos(); +} + +// relative to the ChatLine +QPointF ChatItem::mapToScene(const QPointF &p) const { + return chatLine()->mapToScene(p /* + pos() */); +} + +QPointF ChatItem::mapFromScene(const QPointF &p) const { + return chatLine()->mapFromScene(p) /* - pos() */; } QVariant ChatItem::data(int role) const { @@ -58,19 +100,19 @@ QVariant ChatItem::data(int role) const { return model()->data(index, role); } -qint16 ChatItem::posToCursor(const QPointF &pos) const { - if(pos.y() > height()) return data(MessageModel::DisplayRole).toString().length(); - if(pos.y() < 0) return 0; +QTextLayout *ChatItem::layout() const { + if(_cachedLayout) + return _cachedLayout; - QTextLayout layout; - initLayout(&layout); - for(int l = layout.lineCount() - 1; l >= 0; l--) { - QTextLine line = layout.lineAt(l); - if(pos.y() >= line.y()) { - return line.xToCursor(pos.x(), QTextLine::CursorOnCharacter); - } - } - return 0; + _cachedLayout = new QTextLayout; + initLayout(_cachedLayout); + chatView()->setHasCache(chatLine()); + return _cachedLayout; +} + +void ChatItem::clearCache() { + delete _cachedLayout; + _cachedLayout = 0; } void ChatItem::initLayoutHelper(QTextLayout *layout, QTextOption::WrapMode wrapMode, Qt::Alignment alignment) const { @@ -84,10 +126,15 @@ void ChatItem::initLayoutHelper(QTextLayout *layout, QTextOption::WrapMode wrapM layout->setTextOption(option); QList formatRanges - = QtUi::style()->toTextLayoutList(data(MessageModel::FormatRole).value(), layout->text().length(), data(ChatLineModel::MsgLabelRole).toUInt()); + = QtUi::style()->toTextLayoutList(formatList(), layout->text().length(), data(ChatLineModel::MsgLabelRole).toUInt()); layout->setAdditionalFormats(formatRanges); } +void ChatItem::initLayout(QTextLayout *layout) const { + initLayoutHelper(layout, QTextOption::NoWrap); + doLayout(layout); +} + void ChatItem::doLayout(QTextLayout *layout) const { layout->beginLayout(); QTextLine line = layout->createLine(); @@ -98,9 +145,27 @@ void ChatItem::doLayout(QTextLayout *layout) const { layout->endLayout(); } -void ChatItem::paintBackground(QPainter *painter) { - painter->setClipRect(boundingRect()); // no idea why QGraphicsItem clipping won't work +UiStyle::FormatList ChatItem::formatList() const { + return data(MessageModel::FormatRole).value(); +} + +qint16 ChatItem::posToCursor(const QPointF &posInLine) const { + QPointF pos = mapFromLine(posInLine); + if(pos.y() > height()) + return data(MessageModel::DisplayRole).toString().length(); + if(pos.y() < 0) + return 0; + + for(int l = layout()->lineCount() - 1; l >= 0; l--) { + QTextLine line = layout()->lineAt(l); + if(pos.y() >= line.y()) { + return line.xToCursor(pos.x(), QTextLine::CursorOnCharacter); + } + } + return 0; +} +void ChatItem::paintBackground(QPainter *painter) { QVariant bgBrush; if(_selectionMode == FullSelection) bgBrush = data(ChatLineModel::SelectedBackgroundRole); @@ -114,11 +179,11 @@ void ChatItem::paintBackground(QPainter *painter) { // 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); + painter->save(); + painter->setClipRect(boundingRect()); paintBackground(painter); - QTextLayout layout; - initLayout(&layout); - layout.draw(painter, QPointF(0,0), selectionFormats(), boundingRect()); + layout()->draw(painter, pos(), additionalFormats(), boundingRect()); // layout()->draw(painter, QPointF(0,0), formats, boundingRect()); @@ -148,6 +213,36 @@ void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, // } // 3) draw bounding rect // painter->drawRect(_boundingRect.adjusted(0, 0, -1, -1)); + + painter->restore(); +} + +void ChatItem::overlayFormat(UiStyle::FormatList &fmtList, int start, int end, quint32 overlayFmt) const { + for(int i = 0; i < fmtList.count(); i++) { + int fmtStart = fmtList.at(i).first; + int fmtEnd = (i < fmtList.count()-1 ? fmtList.at(i+1).first : data(MessageModel::DisplayRole).toString().length()); + + if(fmtEnd <= start) + continue; + if(fmtStart >= end) + break; + + // split the format if necessary + if(fmtStart < start) { + fmtList.insert(i, fmtList.at(i)); + fmtList[++i].first = start; + } + if(end < fmtEnd) { + fmtList.insert(i, fmtList.at(i)); + fmtList[i+1].first = end; + } + + fmtList[i].second |= overlayFmt; + } +} + +QVector ChatItem::additionalFormats() const { + return selectionFormats(); } QVector ChatItem::selectionFormats() const { @@ -163,14 +258,14 @@ QVector ChatItem::selectionFormats() const { end = qMax(_selectionStart, _selectionEnd); } - UiStyle::FormatList fmtList = data(MessageModel::FormatRole).value(); + UiStyle::FormatList fmtList = formatList(); - while(fmtList.count() >=2 && fmtList.at(1).first <= start) + while(fmtList.count() > 1 && fmtList.at(1).first <= start) fmtList.removeFirst(); fmtList.first().first = start; - while(fmtList.count() >= 2 && fmtList.last().first >= end) + while(fmtList.count() > 1 && fmtList.last().first >= end) fmtList.removeLast(); return QtUi::style()->toTextLayoutList(fmtList, end, UiStyle::Selected|data(ChatLineModel::MsgLabelRole).toUInt()).toVector(); @@ -197,27 +292,27 @@ void ChatItem::setSelection(SelectionMode mode, qint16 start, qint16 end) { _selectionMode = mode; _selectionStart = start; _selectionEnd = end; - update(); + chatLine()->update(); } void ChatItem::setFullSelection() { if(_selectionMode != FullSelection) { _selectionMode = FullSelection; - update(); + chatLine()->update(); } } void ChatItem::clearSelection() { if(_selectionMode != NoSelection) { _selectionMode = NoSelection; - update(); + chatLine()->update(); } } void ChatItem::continueSelecting(const QPointF &pos) { _selectionMode = PartialSelection; _selectionEnd = posToCursor(pos); - update(); + chatLine()->update(); } bool ChatItem::isPosOverSelection(const QPointF &pos) const { @@ -244,10 +339,8 @@ QList ChatItem::findWords(const QString &searchWord, Qt::CaseSensitivity searchIdx = plainText.indexOf(searchWord, searchIdx + 1, caseSensitive); } - QTextLayout layout; - initLayout(&layout); foreach(int idx, indexList) { - QTextLine line = layout.lineForTextPosition(idx); + QTextLine line = layout()->lineForTextPosition(idx); qreal x = line.cursorToX(idx); qreal width = line.cursorToX(idx + searchWord.count()) - x; qreal height = line.height(); @@ -264,18 +357,18 @@ void ChatItem::handleClick(const QPointF &pos, ChatScene::ClickMode clickMode) { chatScene()->setSelectingItem(this); _selectionStart = _selectionEnd = posToCursor(pos); _selectionMode = NoSelection; // will be set to PartialSelection by mouseMoveEvent - update(); + chatLine()->update(); } } void ChatItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { if(event->buttons() == Qt::LeftButton) { - if(contains(event->pos())) { + if(boundingRect().contains(event->pos())) { qint16 end = posToCursor(event->pos()); if(end != _selectionEnd) { _selectionEnd = end; _selectionMode = (_selectionStart != _selectionEnd ? PartialSelection : NoSelection); - update(); + chatLine()->update(); } } else { setFullSelection(); @@ -312,13 +405,18 @@ void ChatItem::addActionsToMenu(QMenu *menu, const QPointF &pos) { // SenderChatItem // ************************************************************ +void SenderChatItem::initLayout(QTextLayout *layout) const { + initLayoutHelper(layout, QTextOption::ManualWrap, Qt::AlignRight); + doLayout(layout); +} + void SenderChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { Q_UNUSED(option); Q_UNUSED(widget); + painter->save(); + painter->setClipRect(boundingRect()); paintBackground(painter); - QTextLayout layout; - initLayout(&layout); - qreal layoutWidth = layout.minimumWidth(); + qreal layoutWidth = layout()->minimumWidth(); qreal offset = 0; if(chatScene()->senderCutoffMode() == ChatScene::CutoffLeft) offset = qMin(width() - layoutWidth, (qreal)0); @@ -328,10 +426,10 @@ void SenderChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *op if(layoutWidth > width()) { // Draw a nice gradient for longer items // Qt's text drawing with a gradient brush sucks, so we use an alpha-channeled pixmap instead - QPixmap pixmap(layout.boundingRect().toRect().size()); + QPixmap pixmap(layout()->boundingRect().toRect().size()); pixmap.fill(Qt::transparent); QPainter pixPainter(&pixmap); - layout.draw(&pixPainter, QPointF(qMax(offset, (qreal)0), 0), selectionFormats()); + layout()->draw(&pixPainter, QPointF(qMax(offset, (qreal)0), 0), additionalFormats()); pixPainter.end(); // Create alpha channel mask @@ -349,12 +447,25 @@ void SenderChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *op gradient.setColorAt(0, Qt::white); gradient.setColorAt(1, Qt::black); } - maskPainter.fillRect(boundingRect(), gradient); + maskPainter.fillRect(0, 0, pixmap.width(), pixmap.height(), gradient); pixmap.setAlphaChannel(mask); - painter->drawPixmap(0, 0, pixmap); + painter->drawPixmap(pos(), pixmap); } else { - layout.draw(painter, QPointF(0,0), selectionFormats(), boundingRect()); + layout()->draw(painter, pos(), additionalFormats(), boundingRect()); + } + painter->restore(); +} + +void SenderChatItem::handleClick(const QPointF &pos, ChatScene::ClickMode clickMode) { + if(clickMode == ChatScene::DoubleClick) { + BufferInfo curBufInfo = Client::networkModel()->bufferInfo(data(MessageModel::BufferIdRole).value()); + QString nick = data(MessageModel::EditRole).toString(); + // check if the nick is a valid ircUser + if(!nick.isEmpty() && Client::network(curBufInfo.networkId())->ircUser(nick)) + Client::bufferModel()->switchToOrStartQuery(curBufInfo.networkId(), nick); } + else + ChatItem::handleClick(pos, clickMode); } // ************************************************************ @@ -363,47 +474,58 @@ void SenderChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *op ContentsChatItem::ActionProxy ContentsChatItem::_actionProxy; -ContentsChatItem::ContentsChatItem(const qreal &width, const QPointF &pos, QGraphicsItem *parent) - : ChatItem(0, 0, pos, parent), +ContentsChatItem::ContentsChatItem(const QPointF &pos, const qreal &width, ChatLine *parent) + : ChatItem(QRectF(pos, QSizeF(width, 0)), parent), _data(0) { + setPos(pos); setGeometryByWidth(width); } QFontMetricsF *ContentsChatItem::fontMetrics() const { - return QtUi::style()->fontMetrics(data(ChatLineModel::FormatRole).value().at(0).second); + return QtUi::style()->fontMetrics(data(ChatLineModel::FormatRole).value().at(0).second, 0); } ContentsChatItem::~ContentsChatItem() { delete _data; } +void ContentsChatItem::clearCache() { + delete _data; + _data = 0; + ChatItem::clearCache(); +} + ContentsChatItemPrivate *ContentsChatItem::privateData() const { if(!_data) { ContentsChatItem *that = const_cast(this); - that->_data = new ContentsChatItemPrivate(findClickables(), that); + that->_data = new ContentsChatItemPrivate(ClickableList::fromString(data(ChatLineModel::DisplayRole).toString()), that); } return _data; } qreal ContentsChatItem::setGeometryByWidth(qreal w) { - if(w == width()) { - //qDebug() << Q_FUNC_INFO << "Geometry change requested with identical width!"; - } - // We use this for reloading layout info as well - //if(w != width()) { - prepareGeometryChange(); - setWidth(w); - // compute height - int lines = 1; - WrapColumnFinder finder(this); - while(finder.nextWrapColumn() > 0) - lines++; - setHeight(lines * fontMetrics()->lineSpacing()); - delete _data; - _data = 0; - //} - return height(); + // We use this for reloading layout info as well, so we can't bail out if the width doesn't change + + // compute height + int lines = 1; + WrapColumnFinder finder(this); + while(finder.nextWrapColumn(w) > 0) + lines++; + qreal spacing = qMax(fontMetrics()->lineSpacing(), fontMetrics()->height()); // cope with negative leading() + qreal h = lines * spacing; + delete _data; + _data = 0; + + if(w != width() || h != height()) + setGeometry(w, h); + + return h; +} + +void ContentsChatItem::initLayout(QTextLayout *layout) const { + initLayoutHelper(layout, QTextOption::WrapAtWordBoundaryOrAnywhere); + doLayout(layout); } void ContentsChatItem::doLayout(QTextLayout *layout) const { @@ -411,6 +533,7 @@ void ContentsChatItem::doLayout(QTextLayout *layout) const { if(!wrapList.count()) return; // empty chatitem qreal h = 0; + qreal spacing = qMax(fontMetrics()->lineSpacing(), fontMetrics()->height()); // cope with negative leading() WrapColumnFinder finder(this); layout->beginLayout(); forever { @@ -418,104 +541,53 @@ void ContentsChatItem::doLayout(QTextLayout *layout) const { if(!line.isValid()) break; - int col = finder.nextWrapColumn(); - line.setNumColumns(col >= 0 ? col - line.textStart() : layout->text().length()); - line.setPosition(QPointF(0, h)); - h += fontMetrics()->lineSpacing(); - } - layout->endLayout(); -} - -// 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() const { - // For matching URLs - static QString urlEnd("(?:>|[,.;:\"]*\\s|\\b|$)"); - 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("((?:(?:mailto:|\\w+://)|www\\.)%1+)%2").arg(urlChars, urlEnd), Qt::CaseInsensitive), + int col = finder.nextWrapColumn(width()); + if(col < 0) + col = layout->text().length(); + int num = col - line.textStart(); - // 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", Qt::CaseInsensitive) + line.setNumColumns(num); - // TODO: Nicks, we'll need a filtering for only matching known nicknames further down if we do this - }; - - static const int regExpCount = 2; // number of regexps in the array above - - qint16 matches[] = { 0, 0, 0 }; - qint16 matchEnd[] = { 0, 0, 0 }; - - QString str = data(ChatLineModel::DisplayRole).toString(); - - QList result; - qint16 idx = 0; - qint16 minidx; - int type = -1; - - do { - type = -1; - minidx = str.length(); - for(int i = 0; i < regExpCount; i++) { - if(matches[i] < 0 || matchEnd[i] > str.length()) continue; - if(idx >= matchEnd[i]) { - matches[i] = regExp[i].indexIn(str, qMax(matchEnd[i], idx)); - if(matches[i] >= 0) matchEnd[i] = matches[i] + regExp[i].cap(1).length(); - } - if(matches[i] >= 0 && matches[i] < minidx) { - minidx = matches[i]; - type = i; - } + // Sometimes, setNumColumns will create a line that's too long (cf. Qt bug 238249) + // We verify this and try setting the width again, making it shorter each time until the lengths match. + // Dead fugly, but seems to work… + for(int i = line.textLength()-1; i >= 0 && line.textLength() > num; i--) { + line.setNumColumns(i); } - if(type >= 0) { - idx = matchEnd[type]; - QString match = str.mid(matches[type], matchEnd[type] - matches[type]); - if(type == Clickable::Url && str.at(idx-1) == ')') { // special case: closing paren only matches if we had an open one - if(!match.contains('(')) { - matchEnd[type]--; - match.chop(1); - } - } - if(type == Clickable::Channel) { - // don't make clickable if it could be a #number - if(QRegExp("^#\\d+$").exactMatch(match)) - continue; - } - result.append(Clickable((Clickable::Type)type, matches[type], matchEnd[type] - matches[type])); + if(num != line.textLength()) { + qWarning() << "WARNING: Layout engine couldn't workaround Qt bug 238249, please report!"; + // qDebug() << num << line.textLength() << t.mid(line.textStart(), line.textLength()) << t.mid(line.textStart() + line.textLength()); } - } while(type >= 0); - /* testing - if(!result.isEmpty()) qDebug() << str; - foreach(Clickable click, result) { - qDebug() << str.mid(click.start, click.length); + line.setPosition(QPointF(0, h)); + h += spacing; } - */ - return result; + layout->endLayout(); } -ContentsChatItem::Clickable ContentsChatItem::clickableAt(const QPointF &pos) const { - qint16 idx = posToCursor(pos); +Clickable ContentsChatItem::clickableAt(const QPointF &pos) const { + return privateData()->clickables.atCursorPos(posToCursor(pos)); +} + +UiStyle::FormatList ContentsChatItem::formatList() const { + UiStyle::FormatList fmtList = ChatItem::formatList(); for(int i = 0; i < privateData()->clickables.count(); i++) { Clickable click = privateData()->clickables.at(i); - if(idx >= click.start && idx < click.start + click.length) - return click; + if(click.type() == Clickable::Url) { + overlayFormat(fmtList, click.start(), click.start() + click.length(), UiStyle::Url); + } } - return Clickable(); + return fmtList; } QVector ContentsChatItem::additionalFormats() const { + QVector fmt = ChatItem::additionalFormats(); // mark a clickable if hovered upon - QVector fmt; if(privateData()->currentClickable.isValid()) { Clickable click = privateData()->currentClickable; QTextLayout::FormatRange f; - f.start = click.start; - f.length = click.length; + f.start = click.start(); + f.length = click.length(); f.format.setFontUnderline(true); fmt.append(f); } @@ -525,48 +597,30 @@ QVector ContentsChatItem::additionalFormats() const { void ContentsChatItem::endHoverMode() { if(privateData()) { if(privateData()->currentClickable.isValid()) { - setCursor(Qt::ArrowCursor); + chatLine()->unsetCursor(); privateData()->currentClickable = Clickable(); } clearWebPreview(); - update(); + chatLine()->update(); } } void ContentsChatItem::handleClick(const QPointF &pos, ChatScene::ClickMode clickMode) { if(clickMode == ChatScene::SingleClick) { - Clickable click = clickableAt(pos); - if(click.isValid()) { - QString str = data(ChatLineModel::DisplayRole).toString().mid(click.start, click.length); - switch(click.type) { - case Clickable::Url: - if(!str.contains("://")) - str = "http://" + str; - QDesktopServices::openUrl(QUrl::fromEncoded(str.toUtf8(), QUrl::TolerantMode)); - break; - case Clickable::Channel: { - NetworkId networkId = Client::networkModel()->networkId(data(MessageModel::BufferIdRole).value()); - BufferId bufId = Client::networkModel()->bufferId(networkId, str); - if(bufId.isValid()) { - QModelIndex targetIdx = Client::networkModel()->bufferIndex(bufId); - Client::bufferModel()->switchToBuffer(bufId); - if(!targetIdx.data(NetworkModel::ItemActiveRole).toBool()) - Client::userInput(BufferInfo::fakeStatusBuffer(networkId), QString("/JOIN %1").arg(str)); - } else - Client::userInput(BufferInfo::fakeStatusBuffer(networkId), QString("/JOIN %1").arg(str)); - break; - } - default: - break; - } + qint16 idx = posToCursor(pos); + Clickable foo = privateData()->clickables.atCursorPos(idx); + if(foo.isValid()) { + NetworkId networkId = Client::networkModel()->networkId(data(MessageModel::BufferIdRole).value()); + QString text = data(ChatLineModel::DisplayRole).toString(); + foo.activate(networkId, text); } } else if(clickMode == ChatScene::DoubleClick) { chatScene()->setSelectingItem(this); setSelectionMode(PartialSelection); Clickable click = clickableAt(pos); if(click.isValid()) { - setSelectionStart(click.start); - setSelectionEnd(click.start + click.length); + setSelectionStart(click.start()); + setSelectionEnd(click.start() + click.length()); } else { // find word boundary QString str = data(ChatLineModel::DisplayRole).toString(); @@ -577,7 +631,7 @@ void ContentsChatItem::handleClick(const QPointF &pos, ChatScene::ClickMode clic setSelectionStart(start); setSelectionEnd(end); } - update(); + chatLine()->update(); } else if(clickMode == ChatScene::TripleClick) { setSelection(PartialSelection, 0, data(ChatLineModel::DisplayRole).toString().length()); } @@ -599,20 +653,20 @@ void ContentsChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { bool onClickable = false; Clickable click = clickableAt(event->pos()); if(click.isValid()) { - if(click.type == Clickable::Url) { + if(click.type() == Clickable::Url) { onClickable = true; showWebPreview(click); - } else if(click.type == Clickable::Channel) { - QString name = data(ChatLineModel::DisplayRole).toString().mid(click.start, click.length); + } else if(click.type() == Clickable::Channel) { + QString name = data(ChatLineModel::DisplayRole).toString().mid(click.start(), click.length()); // don't make clickable if it's our own name BufferId myId = data(MessageModel::BufferIdRole).value(); if(Client::networkModel()->bufferName(myId) != name) onClickable = true; } if(onClickable) { - setCursor(Qt::PointingHandCursor); + chatLine()->setCursor(Qt::PointingHandCursor); privateData()->currentClickable = click; - update(); + chatLine()->update(); return; } } @@ -623,7 +677,7 @@ void ContentsChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { void ContentsChatItem::addActionsToMenu(QMenu *menu, const QPointF &pos) { if(privateData()->currentClickable.isValid()) { Clickable click = privateData()->currentClickable; - switch(click.type) { + switch(click.type()) { case Clickable::Url: privateData()->activeClickable = click; menu->addAction(SmallIcon("edit-copy"), tr("Copy Link Address"), @@ -633,7 +687,7 @@ void ContentsChatItem::addActionsToMenu(QMenu *menu, const QPointF &pos) { // Hide existing menu actions, they confuse us when right-clicking on a clickable foreach(QAction *action, menu->actions()) action->setVisible(false); - QString name = data(ChatLineModel::DisplayRole).toString().mid(click.start, click.length); + QString name = data(ChatLineModel::DisplayRole).toString().mid(click.start(), click.length()); GraphicalUi::contextMenuActionProvider()->addActions(menu, chatScene()->filter(), data(MessageModel::BufferIdRole).value(), name); break; } @@ -648,8 +702,8 @@ void ContentsChatItem::addActionsToMenu(QMenu *menu, const QPointF &pos) { void ContentsChatItem::copyLinkToClipboard() { Clickable click = privateData()->activeClickable; - if(click.isValid() && click.type == Clickable::Url) { - QString url = data(ChatLineModel::DisplayRole).toString().mid(click.start, click.length); + if(click.isValid() && click.type() == Clickable::Url) { + QString url = data(ChatLineModel::DisplayRole).toString().mid(click.start(), click.length()); if(!url.contains("://")) url = "http://" + url; chatScene()->stringToClipboard(url); @@ -662,20 +716,19 @@ void ContentsChatItem::showWebPreview(const Clickable &click) { #ifndef HAVE_WEBKIT Q_UNUSED(click); #else - QTextLayout layout; - initLayout(&layout); - QTextLine line = layout.lineForTextPosition(click.start); - qreal x = line.cursorToX(click.start); - qreal width = line.cursorToX(click.start + click.length) - x; + 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(); - QPointF topLeft = scenePos() + QPointF(x, y); + QPointF topLeft = mapToScene(pos()) + 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; + QString urlstr = data(ChatLineModel::DisplayRole).toString().mid(click.start(), click.length()); + if(!urlstr.contains("://")) + urlstr= "http://" + urlstr; + QUrl url = QUrl::fromEncoded(urlstr.toUtf8(), QUrl::TolerantMode); chatScene()->loadWebPreview(this, url, urlRect); #endif } @@ -700,12 +753,12 @@ ContentsChatItem::WrapColumnFinder::WrapColumnFinder(const ChatItem *_item) ContentsChatItem::WrapColumnFinder::~WrapColumnFinder() { } -qint16 ContentsChatItem::WrapColumnFinder::nextWrapColumn() { +qint16 ContentsChatItem::WrapColumnFinder::nextWrapColumn(qreal width) { if(wordidx >= wrapList.count()) return -1; lineCount++; - qreal targetWidth = lineCount * item->width() + choppedTrailing; + qreal targetWidth = lineCount * width + choppedTrailing; qint16 start = wordidx; qint16 end = wrapList.count() - 1;