X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatitem.cpp;h=dfb069eafeb656a671b6de324cdfba2a931e16e2;hp=c12d5c5b92b5fe1712b1c52c42415fbad3d5be8f;hb=fbb96765b7039d74a2adaa0d17ed61ee64505786;hpb=84ff541e038763977a99642a90af11ee995c440d

diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp
index c12d5c5b..dfb069ea 100644
--- a/src/qtui/chatitem.cpp
+++ b/src/qtui/chatitem.cpp
@@ -28,14 +28,13 @@
 #include "qtui.h"
 
 ChatItem::ChatItem(const QPersistentModelIndex &index_, QGraphicsItem *parent) : QGraphicsItem(parent), _index(index_) {
-  QFontMetricsF *metrics = QtUi::style()->fontMetrics(data(ChatLineModel::FormatRole).value<UiStyle::FormatList>().at(0).second);
-  _lineHeight = metrics->lineSpacing();
-  _lineLeading = metrics->leading();
+  _fontMetrics = QtUi::style()->fontMetrics(data(ChatLineModel::FormatRole).value<UiStyle::FormatList>().at(0).second);
   _layout = 0;
+  _lines = 0;
 }
 
 ChatItem::~ChatItem() {
-
+  delete _layout;
 }
 
 QVariant ChatItem::data(int role) const {
@@ -47,62 +46,104 @@ QVariant ChatItem::data(int role) const {
 }
 
 int ChatItem::setWidth(int w) {
+  w -= 10;
   if(w == _boundingRect.width()) return _boundingRect.height();
-  int h = heightForWidth(w);
   _boundingRect.setWidth(w);
+  int h = heightForWidth(w);
   _boundingRect.setHeight(h);
+  if(haveLayout()) updateLayout();
   return h;
 }
 
 int ChatItem::heightForWidth(int width) {
   if(data(ChatLineModel::ColumnTypeRole).toUInt() != ChatLineModel::ContentsColumn)
-    return _lineHeight; // only contents can be multi-line
+    return fontMetrics()->lineSpacing(); // only contents can be multi-line
 
-  QVariantList wrapList = data(ChatLineModel::WrapListRole).toList();
-  int lines = 1;
-  int offset = 0;
-  for(int i = 0; i < wrapList.count(); i+=2) {
-    if(wrapList.at(i+1).toUInt() - offset < width) continue;
-    lines++;
-    if(i > 0) {
-      if(offset < wrapList.at(i-1).toUInt()) offset = wrapList.at(i-1).toUInt();
-      else offset += width;
-    } else {
-      offset += width;
+  _lines = 1;
+  WrapColumnFinder finder(this);
+  while(finder.nextWrapColumn() > 0) _lines++;
+  return _lines * fontMetrics()->lineSpacing();
+}
+
+ChatItem::WrapColumnFinder::WrapColumnFinder(ChatItem *_item) : item(_item) {
+  wrapList = item->data(ChatLineModel::WrapListRole).value<ChatLineModel::WrapList>();
+  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;
     }
-    i-=2;
+    w += wrapList.at(wordidx).trailing;
+    wordidx++;
   }
-  return lines * _lineHeight;
+  return -1;
 }
 
-void ChatItem::layout() {
-  if(_layout) return;
-  _layout = new QTextLayout(data(MessageModel::DisplayRole).toString());
-
-  // Convert format information into a FormatRange
-  QList<QTextLayout::FormatRange> formatRanges;
-  UiStyle::FormatList formatList = data(MessageModel::FormatRole).value<UiStyle::FormatList>();
-  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);
+QTextLayout *ChatItem::createLayout(QTextOption::WrapMode wrapMode) {
+  QTextLayout *layout = new QTextLayout(data(MessageModel::DisplayRole).toString());
+
+  QTextOption option;
+  option.setWrapMode(wrapMode);
+  layout->setTextOption(option);
+
+  QList<QTextLayout::FormatRange> formatRanges
+         = QtUi::style()->toTextLayoutList(data(MessageModel::FormatRole).value<UiStyle::FormatList>(), 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<ChatLineModel::WrapList>();
+  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;
 
-    line.setLineWidth(width());
-    h += _lineLeading;
+    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();
   }
@@ -114,56 +155,20 @@ void ChatItem::clearLayout() {
   _layout = 0;
 }
 
+//int ChatItem::findNextWrapColumn(
+
 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<QTextLayout::FormatRange>(), boundingRect());
-}
-
-/*
-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();
+  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);
   }
-  _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 ) {