X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatitem.cpp;h=487c2f2fc7e3a23db72df88ad732b7b58b245125;hp=ff81259cfa385645df3f09b3efa2fd7f2f7c87ce;hb=39e2a78383295f86c5aa2dadbeac6f02b53eb7a4;hpb=209c692cb560ba979442d2f75ed08b4f6adf3120 diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp index ff81259c..487c2f2f 100644 --- a/src/qtui/chatitem.cpp +++ b/src/qtui/chatitem.cpp @@ -34,7 +34,7 @@ ChatItem::ChatItem(const QPersistentModelIndex &index_, QGraphicsItem *parent) : } ChatItem::~ChatItem() { - + delete _layout; } QVariant ChatItem::data(int role) const { @@ -46,10 +46,10 @@ QVariant ChatItem::data(int role) const { } int ChatItem::setWidth(int w) { - w -= 10; if(w == _boundingRect.width()) return _boundingRect.height(); - int h = heightForWidth(w); + prepareGeometryChange(); _boundingRect.setWidth(w); + int h = heightForWidth(w); _boundingRect.setHeight(h); if(haveLayout()) updateLayout(); return h; @@ -59,97 +59,71 @@ int ChatItem::heightForWidth(int width) { if(data(ChatLineModel::ColumnTypeRole).toUInt() != ChatLineModel::ContentsColumn) return fontMetrics()->lineSpacing(); // only contents can be multi-line - ChatLineModel::WrapList wrapList = data(ChatLineModel::WrapListRole).value(); _lines = 1; - qreal w = 0; - for(int i = 0; i < wrapList.count(); i++) { - w += wrapList.at(i).width; - if(w <= width) { - w += wrapList.at(i).trailing; - continue; - } - _lines++; - w = wrapList.at(i).width; - while(w >= width) { // handle words longer than a line - _lines++; - // We do not want to compute an exact split position (that would require us to calculate glyph widths - // and also apply formats in this step...) - // Just using width should be a good estimate, but since a character can't be split in the middle, we - // subtract averageCharWidth as well... sometimes this won't be enough, but meh. - w -= width - 4*fontMetrics()->averageCharWidth(); - } - } + WrapColumnFinder finder(this); + while(finder.nextWrapColumn() > 0) _lines++; return _lines * fontMetrics()->lineSpacing(); } -void ChatItem::layout() { - if(haveLayout()) return; - _layout = new QTextLayout(data(MessageModel::DisplayRole).toString()); +QTextLayout *ChatItem::createLayout(QTextOption::WrapMode wrapMode, Qt::Alignment alignment) { + QTextLayout *layout = new QTextLayout(data(MessageModel::DisplayRole).toString()); QTextOption option; - option.setWrapMode(QTextOption::WrapAnywhere); - _layout->setTextOption(option); - - // Convert format information into a FormatRange - QList formatRanges; - UiStyle::FormatList formatList = data(MessageModel::FormatRole).value(); - QTextLayout::FormatRange range; - int i = 0; - for(i = 0; i < formatList.count(); i++) { - range.format = QtUi::style()->mergedFormat(formatList.at(i).second); - range.start = formatList.at(i).first; - if(i > 0) formatRanges.last().length = range.start - formatRanges.last().start; - formatRanges.append(range); - } - if(i > 0) formatRanges.last().length = _layout->text().length() - formatRanges.last().start; - _layout->setAdditionalFormats(formatRanges); - updateLayout(); + option.setWrapMode(wrapMode); + option.setAlignment(alignment); + layout->setTextOption(option); + + QList formatRanges + = QtUi::style()->toTextLayoutList(data(MessageModel::FormatRole).value(), layout->text().length()); + layout->setAdditionalFormats(formatRanges); + return layout; } void ChatItem::updateLayout() { - if(!haveLayout()) layout(); - - // Now layout - ChatLineModel::WrapList wrapList = data(ChatLineModel::WrapListRole).value(); - if(!wrapList.count()) return; // empty chatitem - int wordidx = 0; - ChatLineModel::Word word = wrapList.at(0); - - qreal h = 0; - _layout->beginLayout(); - forever { - QTextLine line = _layout->createLine(); - if (!line.isValid()) - break; - - if(word.width >= width()) { - line.setLineWidth(width()); - word.width -= line.naturalTextWidth(); - word.start = line.textStart() + line.textLength(); - //qDebug() << "setting width: " << width(); - } else { - int w = 0; - while((w += word.width) <= width() && wordidx < wrapList.count()) { - w += word.trailing; - if(++wordidx < wrapList.count()) word = wrapList.at(wordidx); - else { - // last word (and it fits), but if we expected an extra line, wrap anyway here - // yeah, this is cheating, but much cheaper than computing widths ourself - if(_layout->lineCount() < _lines) { - wordidx--; qDebug() << "trigger!" << _lines << _layout->text(); - break; - } + switch(data(ChatLineModel::ColumnTypeRole).toUInt()) { + case ChatLineModel::TimestampColumn: + if(!haveLayout()) _layout = createLayout(QTextOption::WrapAnywhere, Qt::AlignLeft); + // fallthrough + case ChatLineModel::SenderColumn: + if(!haveLayout()) _layout = createLayout(QTextOption::WrapAnywhere, Qt::AlignRight); + _layout->beginLayout(); + { + QTextLine line = _layout->createLine(); + if(line.isValid()) { + line.setLineWidth(width()); + line.setPosition(QPointF(0, fontMetrics()->leading())); } + _layout->endLayout(); + } + break; + case ChatLineModel::ContentsColumn: { + if(!haveLayout()) _layout = createLayout(QTextOption::WrapAnywhere); + + // Now layout + ChatLineModel::WrapList wrapList = data(ChatLineModel::WrapListRole).value(); + if(!wrapList.count()) return; // empty chatitem + int wordidx = 0; + ChatLineModel::Word word = wrapList.at(0); + + qreal h = 0; + WrapColumnFinder finder(this); + _layout->beginLayout(); + forever { + QTextLine line = _layout->createLine(); + if (!line.isValid()) + break; + + int col = finder.nextWrapColumn(); + line.setNumColumns(col >= 0 ? col - line.textStart() : _layout->text().length()); + + h += fontMetrics()->leading(); + line.setPosition(QPointF(0, h)); + h += line.height(); } - int lastcol = wordidx < wrapList.count() ? word.start : _layout->text().length(); - line.setNumColumns(lastcol - line.textStart());// qDebug() << "setting cols:" << lastcol - line.textStart(); + _layout->endLayout(); } - - h += fontMetrics()->leading(); - line.setPosition(QPointF(0, h)); - h += line.height(); + break; } - _layout->endLayout(); } void ChatItem::clearLayout() { @@ -159,61 +133,11 @@ void ChatItem::clearLayout() { void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { Q_UNUSED(option); Q_UNUSED(widget); - layout(); + if(!haveLayout()) updateLayout(); _layout->draw(painter, QPointF(0,0), QVector(), boundingRect()); - painter->drawRect(boundingRect()); - int width = 0; - QVariantList wrapList = data(ChatLineModel::WrapListRole).toList(); - for(int i = 2; i < wrapList.count(); i+=2) { - QRect r(wrapList[i-1].toUInt(), 0, wrapList[i+1].toUInt() - wrapList[i-1].toUInt(), fontMetrics()->lineSpacing()); - painter->drawRect(r); - } -} - -/* -void ChatItem::layout() { - if(!_layout.additionalFormats().count()) return; // no text set - if(_width <= 0) return; - prepareGeometryChange(); - QFontMetrics metrics(_layout.additionalFormats()[0].format.font()); - int leading = metrics.leading(); - int height = 0; - _layout.setTextOption(textOption()); - _layout.beginLayout(); - while(1) { - QTextLine line = _layout.createLine(); - if(!line.isValid()) break; - line.setLineWidth(_width); - if(textOption().wrapMode() != QTextOption::NoWrap && line.naturalTextWidth() > _width) { - // word did not fit, we need to wrap it in the middle - // this is a workaround for Qt failing to handle WrapAtWordBoundaryOrAnywhere correctly - QTextOption::WrapMode mode = textOption().wrapMode(); - textOption().setWrapMode(QTextOption::WrapAnywhere); - _layout.setTextOption(textOption()); - line.setLineWidth(_width); - textOption().setWrapMode(mode); - _layout.setTextOption(textOption()); - } - height += leading; - line.setPosition(QPoint(0, height)); - height += line.height(); - } - _layout.endLayout(); - update(); -} QDateTime _timestamp; - MsgId _msgId; - - -QRectF ChatItem::boundingRect() const { - return _layout.boundingRect(); -} - -void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - Q_UNUSED(option); Q_UNUSED(widget); - _layout.draw(painter, QPointF(0, 0)); + //painter->drawRect(boundingRect()); } -*/ /* void ChatItem::mouseMoveEvent ( QGraphicsSceneMouseEvent * event ) { @@ -226,3 +150,50 @@ void ChatItem::mouseMoveEvent ( QGraphicsSceneMouseEvent * event ) { } else QGraphicsTextItem::mouseMoveEvent(event); } */ + +/*************************************************************************************************/ + +ChatItem::WrapColumnFinder::WrapColumnFinder(ChatItem *_item) : item(_item) { + wrapList = item->data(ChatLineModel::WrapListRole).value(); + wordidx = 0; + layout = 0; + lastwrapcol = 0; + lastwrappos = 0; + w = 0; +} + +ChatItem::WrapColumnFinder::~WrapColumnFinder() { + delete layout; +} + +int ChatItem::WrapColumnFinder::nextWrapColumn() { + while(wordidx < wrapList.count()) { + w += wrapList.at(wordidx).width; + if(w >= item->width()) { + if(lastwrapcol >= wrapList.at(wordidx).start) { + // first word, and it doesn't fit + if(!line.isValid()) { + layout = item->createLayout(QTextOption::NoWrap); + layout->beginLayout(); + line = layout->createLine(); + line.setLineWidth(item->width()); + layout->endLayout(); + } + int idx = line.xToCursor(lastwrappos + item->width(), QTextLine::CursorOnCharacter); + qreal x = line.cursorToX(idx, QTextLine::Trailing); + w = w - wrapList.at(wordidx).width - (x - lastwrappos); + lastwrappos = x; + lastwrapcol = idx; + return idx; + } + // not the first word, so just wrap before this + lastwrapcol = wrapList.at(wordidx).start; + lastwrappos = lastwrappos + w - wrapList.at(wordidx).width; + w = 0; + return lastwrapcol; + } + w += wrapList.at(wordidx).trailing; + wordidx++; + } + return -1; +}