X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatlinemodelitem.cpp;h=38663bb02301bcee2339d90f26b6b5d94dc506ff;hp=9529412f5115df45ecf45046481a6562f9543e6d;hb=3197b8b309f09ac1f4db54fa8fa819e33b87383e;hpb=b9e68646b3404fd99adb94773821467da98b0c7b

diff --git a/src/qtui/chatlinemodelitem.cpp b/src/qtui/chatlinemodelitem.cpp
index 9529412f..38663bb0 100644
--- a/src/qtui/chatlinemodelitem.cpp
+++ b/src/qtui/chatlinemodelitem.cpp
@@ -58,10 +58,7 @@ QVariant ChatLineModelItem::data(int column, int role) const {
       return QVariant::fromValue<UiStyle::FormatList>(part->formatList);
     case ChatLineModel::WrapListRole:
       if(column != ChatLineModel::ContentsColumn) return QVariant();
-      QVariantList wrapList;
-      typedef QPair<quint16, quint16> WrapPoint;  // foreach can't parse templated params
-      foreach(WrapPoint pair, _wrapList) wrapList << pair.first << pair.second;
-      return wrapList;
+      return QVariant::fromValue<ChatLineModel::WrapList>(_wrapList);
   }
 
   return MessageModelItem::data(column, role);
@@ -71,33 +68,61 @@ bool ChatLineModelItem::setData(int column, const QVariant &value, int role) {
   return false;
 }
 
+// compute the width of a text snippet
+qreal ChatLineModelItem::snippetWidth(int start, int end, QFontMetricsF *&metrics, int &formatListIdx, int &formatEnd) {
+  qreal width = 0;
+  while(start < end) {
+    if(formatEnd <= start) {
+      formatListIdx++;
+      formatEnd = _contents.formatList.count() > formatListIdx+1 ? _contents.formatList[formatListIdx+1].first
+                                                                 : _contents.plainText.length();
+      metrics = QtUi::style()->fontMetrics(_contents.formatList[formatListIdx].second);
+      Q_ASSERT(formatEnd > start);
+    }
+    int i = qMin(end, formatEnd);
+    width += metrics->width(_contents.plainText.mid(start, i - start));
+    start = i;
+  }
+  return width;
+}
+
 void ChatLineModelItem::computeWrapList() {
-  WrapList wplist;  // use a temp list which we'll later copy into a QVector for efficiency
+  enum Mode { SearchStart, SearchEnd };
+
+  QList<ChatLineModel::Word> wplist;  // use a temp list which we'll later copy into a QVector for efficiency
   QTextBoundaryFinder finder(QTextBoundaryFinder::Word, _contents.plainText);
-  int idx;
+  int idx, oldidx;
+  qreal pxpos = 0;
   int flistidx = -1;
   int fmtend = -1;
-  QFontMetricsF *metrics;
-  QPair<quint16, quint16> wp(0, 0);
+  bool wordStart = false; bool wordEnd = false;
+  QFontMetricsF *metrics = 0;
+  Mode mode = SearchEnd;
+  ChatLineModel::Word word;
+  word.start = 0;
   do {
     idx = finder.toNextBoundary();
     if(idx < 0) idx = _contents.plainText.length();
-    else if(finder.boundaryReasons() != QTextBoundaryFinder::StartWord) continue;
-    int start = wp.first;
-    while(start < idx) {
-      if(fmtend <= start) {
-        flistidx++;
-        fmtend = _contents.formatList.count() > flistidx+1 ? _contents.formatList[flistidx+1].first
-                                                           : _contents.plainText.length();
-        metrics = QtUi::style()->fontMetrics(_contents.formatList[flistidx].second);
-        Q_ASSERT(fmtend > start);
-      }
-      int i = qMin(idx, fmtend);
-      wp.second += metrics->width(_contents.plainText.mid(start, i - start));
-      start = i;
+    wordStart = finder.boundaryReasons().testFlag(QTextBoundaryFinder::StartWord);
+    wordEnd = finder.boundaryReasons().testFlag(QTextBoundaryFinder::EndWord);
+
+    //qDebug() << wordStart << wordEnd << _contents.plainText.left(idx) << _contents.plainText.mid(idx);
+
+    if(mode == SearchEnd || !wordStart && wordEnd) {
+      if(wordStart || !wordEnd) continue;
+      oldidx = idx;
+      mode = SearchStart;
+      continue;
+    }
+    // mode == SearchStart
+    word.width = snippetWidth(word.start, oldidx, metrics, flistidx, fmtend);
+    word.trailing = snippetWidth(oldidx, idx, metrics, flistidx, fmtend);
+    wplist.append(word);
+
+    if(wordStart) {
+      word.start = idx;
+      mode = SearchEnd;
     }
-    wplist.append(wp);
-    wp.first = idx;
   } while(finder.isAtBoundary());
 
   // A QVector needs less space than a QList