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

diff --git a/src/qtui/chatlinemodelitem.cpp b/src/qtui/chatlinemodelitem.cpp
index 9529412f..73b15330 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);
@@ -72,32 +69,60 @@ bool ChatLineModelItem::setData(int column, const QVariant &value, int role) {
 }
 
 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 flistidx = -1;
-  int fmtend = -1;
-  QFontMetricsF *metrics;
-  QPair<quint16, quint16> wp(0, 0);
+  int oldidx = 0;
+  bool wordStart = false; bool wordEnd = false;
+  Mode mode = SearchEnd;
+  ChatLineModel::Word word;
+  word.start = 0;
+  int wordstartx = 0;
+
+  QTextLayout layout(_contents.plainText);
+  QTextOption option;
+  option.setWrapMode(QTextOption::NoWrap);
+  layout.setTextOption(option);
+
+  layout.setAdditionalFormats(QtUi::style()->toTextLayoutList(_contents.formatList, _contents.plainText.length()));
+  layout.beginLayout();
+  QTextLine line = layout.createLine();
+  line.setNumColumns(_contents.plainText.length());
+  layout.endLayout();
+
   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;
+    if(idx < 0) {
+      idx = _contents.plainText.length();
+      wordStart = false;
+      wordEnd = false;
+      mode = SearchStart;
+    } else {
+      wordStart = finder.boundaryReasons().testFlag(QTextBoundaryFinder::StartWord);
+      wordEnd = finder.boundaryReasons().testFlag(QTextBoundaryFinder::EndWord);
+    }
+
+    //if(flg) qDebug() << idx << mode << wordStart << wordEnd << _contents.plainText.left(idx) << _contents.plainText.mid(idx);
+
+    if(mode == SearchEnd || (!wordStart && wordEnd)) {
+      if(wordStart || !wordEnd) continue;
+      oldidx = idx;
+      mode = SearchStart;
+      continue;
+    }
+    int wordendx = line.cursorToX(oldidx);
+    int trailingendx = line.cursorToX(idx);
+    word.width = wordendx - wordstartx;
+    word.trailing = trailingendx - wordendx;
+    wordstartx = trailingendx;
+    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