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

diff --git a/src/qtui/chatlinemodelitem.cpp b/src/qtui/chatlinemodelitem.cpp
index 38663bb0..73b15330 100644
--- a/src/qtui/chatlinemodelitem.cpp
+++ b/src/qtui/chatlinemodelitem.cpp
@@ -68,55 +68,55 @@ 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() {
   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, oldidx;
-  qreal pxpos = 0;
-  int flistidx = -1;
-  int fmtend = -1;
+  int idx;
+  int oldidx = 0;
   bool wordStart = false; bool wordEnd = false;
-  QFontMetricsF *metrics = 0;
   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();
-    wordStart = finder.boundaryReasons().testFlag(QTextBoundaryFinder::StartWord);
-    wordEnd = finder.boundaryReasons().testFlag(QTextBoundaryFinder::EndWord);
+    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);
+    }
 
-    //qDebug() << wordStart << wordEnd << _contents.plainText.left(idx) << _contents.plainText.mid(idx);
+    //if(flg) qDebug() << idx << mode << wordStart << wordEnd << _contents.plainText.left(idx) << _contents.plainText.mid(idx);
 
-    if(mode == SearchEnd || !wordStart && wordEnd) {
+    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);
+    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) {