X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatitem.cpp;h=e0ab0194bb30e26426b78cec6f643ffbf9fec765;hp=495a97ef434b2a0a376721e6db47d9f29160bca2;hb=8e871e8a152cfefff248c9284cc18530a332a58d;hpb=176d22d49934223b9279719ac5d9e7c03e530d40 diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp index 495a97ef..e0ab0194 100644 --- a/src/qtui/chatitem.cpp +++ b/src/qtui/chatitem.cpp @@ -32,17 +32,13 @@ #include "qtui.h" #include "qtuistyle.h" -ChatItem::ChatItem(const qreal &width, const qreal &height, const QPointF &pos, ChatLineModel::ColumnType col, QGraphicsItem *parent) +ChatItem::ChatItem(const qreal &width, const qreal &height, const QPointF &pos, QGraphicsItem *parent) : QGraphicsItem(parent), _data(0), _boundingRect(0, 0, width, height), - _fontMetrics(0), _selectionMode(NoSelection), _selectionStart(-1) { - const QAbstractItemModel *model_ = model(); - QModelIndex index = model_->index(row(), col); - _fontMetrics = QtUi::style()->fontMetrics(model_->data(index, ChatLineModel::FormatRole).value().at(0).second); setAcceptHoverEvents(true); setZValue(20); setPos(pos); @@ -123,19 +119,30 @@ 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)); } @@ -185,17 +192,21 @@ QList ChatItem::findWords(const QString &searchWord, Qt::CaseSensitivity searchIdx = plainText.indexOf(searchWord, searchIdx + 1, caseSensitive); } - if(!hasLayout()) + bool hadLayout = hasLayout(); + if(!hadLayout) updateLayout(); foreach(int idx, indexList) { QTextLine line = layout()->lineForTextPosition(idx); qreal x = line.cursorToX(idx); qreal width = line.cursorToX(idx + searchWord.count()) - x; - qreal height = fontMetrics()->lineSpacing(); + qreal height = line.height(); qreal y = height * line.lineNumber(); resultList << QRectF(x, y, width, height); } + + if(!hadLayout) + clearLayout(); return resultList; } @@ -250,8 +261,12 @@ void ChatItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { // ContentsChatItem // ************************************************************ ContentsChatItem::ContentsChatItem(const qreal &width, const QPointF &pos, QGraphicsItem *parent) - : ChatItem(0, 0, pos, column(), parent) + : ChatItem(0, 0, pos, parent) { + const QAbstractItemModel *model_ = model(); + QModelIndex index = model_->index(row(), column()); + _fontMetrics = QtUi::style()->fontMetrics(model_->data(index, ChatLineModel::FormatRole).value().at(0).second); + setGeometryByWidth(width); } @@ -270,9 +285,7 @@ qreal ContentsChatItem::setGeometryByWidth(qreal w) { void ContentsChatItem::updateLayout() { if(!privateData()) { - ContentsChatItemPrivate *data = new ContentsChatItemPrivate(createLayout(QTextOption::WrapAnywhere), - findClickables()); - // data->clickables = findClickables(); + ContentsChatItemPrivate *data = new ContentsChatItemPrivate(createLayout(QTextOption::WrapAnywhere), findClickables(), this); setPrivateData(data); } @@ -374,9 +387,12 @@ QVector ContentsChatItem::additionalFormats() const { } void ContentsChatItem::endHoverMode() { - if(privateData()->currentClickable.isValid()) { - setCursor(Qt::ArrowCursor); - privateData()->currentClickable = Clickable(); + if(hasLayout()) { + if(privateData()->currentClickable.isValid()) { + setCursor(Qt::ArrowCursor); + privateData()->currentClickable = Clickable(); + } + clearWebPreview(); update(); } } @@ -394,6 +410,8 @@ void ContentsChatItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { 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(str); break; case Clickable::Channel: @@ -411,7 +429,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(!privateData()->hasDragged && event->buttons() & Qt::LeftButton + if(hasLayout() && !privateData()->hasDragged && event->buttons() & Qt::LeftButton && (event->buttonDownScreenPos(Qt::LeftButton) - event->screenPos()).manhattanLength() >= QApplication::startDragDistance()) privateData()->hasDragged = true; ChatItem::mouseMoveEvent(event); @@ -428,9 +446,10 @@ void ContentsChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { for(int i = 0; i < privateData()->clickables.count(); i++) { Clickable click = privateData()->clickables.at(i); if(idx >= click.start && idx < click.start + click.length) { - if(click.type == Clickable::Url) + if(click.type == Clickable::Url) { onClickable = true; - else if(click.type == Clickable::Channel) { + showWebPreview(click); + } else if(click.type == Clickable::Channel) { // TODO: don't make clickable if it's our own name //onClickable = true; //FIXME disabled for now } @@ -446,6 +465,33 @@ void ContentsChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { event->accept(); } +void ContentsChatItem::showWebPreview(const Clickable &click) { +#ifdef HAVE_WEBKIT + if(!hasLayout()) + updateLayout(); + + 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); + 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; + chatScene()->loadWebPreview(this, url, urlRect); +#endif +} + +void ContentsChatItem::clearWebPreview() { +#ifdef HAVE_WEBKIT + chatScene()->clearWebPreview(this); +#endif +} + /*************************************************************************************************/ ContentsChatItem::WrapColumnFinder::WrapColumnFinder(ChatItem *_item) @@ -454,10 +500,7 @@ ContentsChatItem::WrapColumnFinder::WrapColumnFinder(ChatItem *_item) wrapList(item->data(ChatLineModel::WrapListRole).value()), wordidx(0), lineCount(0), - choppedTrailing(0), - lastwrapcol(0), - lastwrappos(0), - width(0) + choppedTrailing(0) { } @@ -476,25 +519,41 @@ qint16 ContentsChatItem::WrapColumnFinder::nextWrapColumn() { qint16 end = wrapList.count() - 1; // check if the whole line fits - if(wrapList.at(end).endX <= targetWidth || start == end) + if(wrapList.at(end).endX <= targetWidth) // || start == end) return -1; + // check if we have a very long word that needs inter word wrap + if(wrapList.at(start).endX > targetWidth) { + if(!line.isValid()) { + layout = item->createLayout(QTextOption::NoWrap); + layout->beginLayout(); + line = layout->createLine(); + layout->endLayout(); + } + return line.xToCursor(targetWidth, QTextLine::CursorOnCharacter); + } + while(true) { - if(start == end) { - wordidx = start; - if(wordidx > 0) { - const ChatLineModel::Word &prevWord = wrapList.at(wordidx - 1); - choppedTrailing += prevWord.trailing - (targetWidth - prevWord.endX); - } + if(start + 1 == end) { + wordidx = end; + const ChatLineModel::Word &lastWord = wrapList.at(start); // the last word we were able to squeeze in + + // both cases should be cought preliminary + Q_ASSERT(lastWord.endX <= targetWidth); // ensure that "start" really fits in + Q_ASSERT(end < wrapList.count()); // ensure that start isn't the last word + + choppedTrailing += lastWord.trailing - (targetWidth - lastWord.endX); return wrapList.at(wordidx).start; } + qint16 pivot = (end + start) / 2; - if(wrapList.at(pivot).endX > targetWidth && wordidx != pivot) { + if(wrapList.at(pivot).endX > targetWidth) { end = pivot; } else { - start = pivot + 1; + start = pivot; } } + Q_ASSERT(false); return -1; }