X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatitem.cpp;h=fc0f90169386cf0a41e9e75be1be813594c97ced;hp=8063a972365ace53da297ad7a1bdaa431373fb02;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=30b159cb876a9495de42e9a3e70ca050516f0805 diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp index 8063a972..fc0f9016 100644 --- a/src/qtui/chatitem.cpp +++ b/src/qtui/chatitem.cpp @@ -28,10 +28,10 @@ #include #include #include +#include #include #include #include -#include #include "action.h" #include "buffermodel.h" @@ -45,77 +45,65 @@ #include "qtui.h" #include "qtuistyle.h" -ChatItem::ChatItem(const QRectF &boundingRect, ChatLine *parent) - : _parent(parent), - _boundingRect(boundingRect), - _selectionMode(NoSelection), - _selectionStart(-1), - _cachedLayout(nullptr) -{ -} - +ChatItem::ChatItem(const QRectF& boundingRect, ChatLine* parent) + : _parent(parent) + , _boundingRect(boundingRect) + , _selectionMode(NoSelection) + , _selectionStart(-1) + , _cachedLayout(nullptr) +{} ChatItem::~ChatItem() { delete _cachedLayout; } - -ChatLine *ChatItem::chatLine() const +ChatLine* ChatItem::chatLine() const { return _parent; } - -ChatScene *ChatItem::chatScene() const +ChatScene* ChatItem::chatScene() const { return chatLine()->chatScene(); } - -ChatView *ChatItem::chatView() const +ChatView* ChatItem::chatView() const { return chatScene()->chatView(); } - -const QAbstractItemModel *ChatItem::model() const +const QAbstractItemModel* ChatItem::model() const { return chatLine()->model(); } - int ChatItem::row() const { return chatLine()->row(); } - -QPointF ChatItem::mapToLine(const QPointF &p) const +QPointF ChatItem::mapToLine(const QPointF& p) const { return p + pos(); } - -QPointF ChatItem::mapFromLine(const QPointF &p) const +QPointF ChatItem::mapFromLine(const QPointF& p) const { return p - pos(); } - // relative to the ChatLine -QPointF ChatItem::mapToScene(const QPointF &p) const +QPointF ChatItem::mapToScene(const QPointF& p) const { return chatLine()->mapToScene(p /* + pos() */); } - -QPointF ChatItem::mapFromScene(const QPointF &p) const +QPointF ChatItem::mapFromScene(const QPointF& p) const { return chatLine()->mapFromScene(p) /* - pos() */; } - QVariant ChatItem::data(int role) const { QModelIndex index = model()->index(row(), column()); @@ -126,8 +114,7 @@ QVariant ChatItem::data(int role) const return model()->data(index, role); } - -QTextLayout *ChatItem::layout() const +QTextLayout* ChatItem::layout() const { if (_cachedLayout) return _cachedLayout; @@ -138,15 +125,13 @@ QTextLayout *ChatItem::layout() const return _cachedLayout; } - void ChatItem::clearCache() { delete _cachedLayout; _cachedLayout = nullptr; } - -void ChatItem::initLayoutHelper(QTextLayout *layout, QTextOption::WrapMode wrapMode, Qt::Alignment alignment) const +void ChatItem::initLayoutHelper(QTextLayout* layout, QTextOption::WrapMode wrapMode, Qt::Alignment alignment) const { Q_ASSERT(layout); @@ -157,20 +142,20 @@ void ChatItem::initLayoutHelper(QTextLayout *layout, QTextOption::WrapMode wrapM option.setAlignment(alignment); layout->setTextOption(option); - QList formatRanges - = QtUi::style()->toTextLayoutList(formatList(), layout->text().length(), data(ChatLineModel::MsgLabelRole).value()); + QList formatRanges = QtUi::style() + ->toTextLayoutList(formatList(), + layout->text().length(), + data(ChatLineModel::MsgLabelRole).value()); layout->setAdditionalFormats(formatRanges); } - -void ChatItem::initLayout(QTextLayout *layout) const +void ChatItem::initLayout(QTextLayout* layout) const { initLayoutHelper(layout, QTextOption::NoWrap); doLayout(layout); } - -void ChatItem::doLayout(QTextLayout *layout) const +void ChatItem::doLayout(QTextLayout* layout) const { layout->beginLayout(); QTextLine line = layout->createLine(); @@ -181,14 +166,12 @@ void ChatItem::doLayout(QTextLayout *layout) const layout->endLayout(); } - UiStyle::FormatList ChatItem::formatList() const { return data(MessageModel::FormatRole).value(); } - -qint16 ChatItem::posToCursor(const QPointF &posInLine) const +qint16 ChatItem::posToCursor(const QPointF& posInLine) const { QPointF pos = mapFromLine(posInLine); if (pos.y() > height()) @@ -205,8 +188,7 @@ qint16 ChatItem::posToCursor(const QPointF &posInLine) const return 0; } - -void ChatItem::paintBackground(QPainter *painter) +void ChatItem::paintBackground(QPainter* painter) { QVariant bgBrush; if (_selectionMode == FullSelection) @@ -217,12 +199,12 @@ void ChatItem::paintBackground(QPainter *painter) painter->fillRect(boundingRect(), bgBrush.value()); } - // 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) +void ChatItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) { - Q_UNUSED(option); Q_UNUSED(widget); + Q_UNUSED(option); + Q_UNUSED(widget); painter->save(); painter->setClipRect(boundingRect()); paintBackground(painter); @@ -235,38 +217,37 @@ void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, // 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); -// 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().toLongLong()); -// QPointF bottomPoint = boundingRect().bottomLeft(); -// bottomPoint.ry() -= 2; -// painter->drawText(bottomPoint, msgIdString); -// } -// 3) draw bounding rect -// painter->drawRect(_boundingRect.adjusted(0, 0, -1, -1)); + // if(row() % 2) + // painter->setPen(Qt::red); + // else + // painter->setPen(Qt::blue); + // 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().toLongLong()); + // QPointF bottomPoint = boundingRect().bottomLeft(); + // bottomPoint.ry() -= 2; + // painter->drawText(bottomPoint, msgIdString); + // } + // 3) draw bounding rect + // painter->drawRect(_boundingRect.adjusted(0, 0, -1, -1)); painter->restore(); } - -void ChatItem::overlayFormat(UiStyle::FormatList &fmtList, quint16 start, quint16 end, UiStyle::FormatType overlayFmt) const +void ChatItem::overlayFormat(UiStyle::FormatList& fmtList, quint16 start, quint16 end, UiStyle::FormatType overlayFmt) const { for (size_t i = 0; i < fmtList.size(); i++) { int fmtStart = fmtList.at(i).first; - int fmtEnd = (i < fmtList.size()-1 ? fmtList.at(i+1).first : data(MessageModel::DisplayRole).toString().length()); + int fmtEnd = (i < fmtList.size() - 1 ? fmtList.at(i + 1).first : data(MessageModel::DisplayRole).toString().length()); if (fmtEnd <= start) continue; @@ -280,14 +261,13 @@ void ChatItem::overlayFormat(UiStyle::FormatList &fmtList, quint16 start, quint1 } if (end < fmtEnd) { fmtList.insert(fmtList.begin() + i, fmtList.at(i)); - fmtList[i+1].first = end; + fmtList[i + 1].first = end; } fmtList[i].second.type |= overlayFmt; } } - QVector ChatItem::additionalFormats() const { // Calculate formats to overlay (only) if there's a selection, and/or a hovered clickable @@ -299,9 +279,10 @@ QVector ChatItem::additionalFormats() const using Format = UiStyle::Format; auto itemLabel = data(ChatLineModel::MsgLabelRole).value