X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatitem.cpp;h=a3f3d307f1b42103f2ab6dcc3bf72ff8c0519ec7;hp=c9d20c1e0271a98d7b7bce1373b1a8debfac0ea2;hb=0a05c86756e0efe65fe0e19233fbdbdd48b58793;hpb=279da77e67a66d2e0e239b3d7fd9809ac691dfc8 diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp index c9d20c1e..a3f3d307 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,7 +46,6 @@ QVariant ChatItem::data(int role) const { } int ChatItem::setWidth(int w) { - w -= 10; if(w == _boundingRect.width()) return _boundingRect.height(); _boundingRect.setWidth(w); int h = heightForWidth(w); @@ -65,6 +64,94 @@ int ChatItem::heightForWidth(int width) { return _lines * fontMetrics()->lineSpacing(); } +QTextLayout *ChatItem::createLayout(QTextOption::WrapMode wrapMode, Qt::Alignment alignment) { + QTextLayout *layout = new QTextLayout(data(MessageModel::DisplayRole).toString()); + + QTextOption option; + 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() { + 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(); + } + _layout->endLayout(); + } + break; + } +} + +void ChatItem::clearLayout() { + delete _layout; + _layout = 0; +} + +void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { + Q_UNUSED(option); Q_UNUSED(widget); + if(!haveLayout()) updateLayout(); + _layout->draw(painter, QPointF(0,0), QVector(), boundingRect()); + //painter->drawRect(boundingRect()); + +} + +/* +void ChatItem::mouseMoveEvent ( QGraphicsSceneMouseEvent * event ) { + qDebug() << (void*)this << "moving" << event->pos(); + if(event->pos().y() < 0) { + QTextCursor cursor(document()); + //cursor.insertText("foo"); + //cursor.select(QTextCursor::Document); + event->ignore(); + } else QGraphicsTextItem::mouseMoveEvent(event); +} +*/ + +/*************************************************************************************************/ + ChatItem::WrapColumnFinder::WrapColumnFinder(ChatItem *_item) : item(_item) { wrapList = item->data(ChatLineModel::WrapListRole).value(); wordidx = 0; @@ -91,8 +178,8 @@ int ChatItem::WrapColumnFinder::nextWrapColumn() { line.setLineWidth(item->width()); layout->endLayout(); } - int idx = line.xToCursor(lastwrappos + item->width()); - qreal x = line.cursorToX(idx); + 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; @@ -109,121 +196,3 @@ int ChatItem::WrapColumnFinder::nextWrapColumn() { } return -1; } - -QTextLayout *ChatItem::createLayout(QTextOption::WrapMode wrapMode) { - QTextLayout *layout = new QTextLayout(data(MessageModel::DisplayRole).toString()); - - QTextOption option; - option.setWrapMode(wrapMode); - 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 = 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(); - } - _layout->endLayout(); -} - -void ChatItem::clearLayout() { - delete _layout; - _layout = 0; -} - -//int ChatItem::findNextWrapColumn( - -void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - Q_UNUSED(option); Q_UNUSED(widget); - 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)); - -} -*/ - -/* -void ChatItem::mouseMoveEvent ( QGraphicsSceneMouseEvent * event ) { - qDebug() << (void*)this << "moving" << event->pos(); - if(event->pos().y() < 0) { - QTextCursor cursor(document()); - //cursor.insertText("foo"); - //cursor.select(QTextCursor::Document); - event->ignore(); - } else QGraphicsTextItem::mouseMoveEvent(event); -} -*/