_sender.formatList = m.sender.formatList;
_contents.formatList = m.contents.formatList;
- computeWordList();
+ computeWrapList();
}
}
switch(role) {
- case ChatLineModel::DisplayRole: return part->plainText;
- case ChatLineModel::FormatRole: return QVariant::fromValue<UiStyle::FormatList>(part->formatList);
+ case ChatLineModel::DisplayRole:
+ return part->plainText;
+ case ChatLineModel::FormatRole:
+ return QVariant::fromValue<UiStyle::FormatList>(part->formatList);
+ case ChatLineModel::WrapListRole:
+ if(column != ChatLineModel::ContentsColumn) return QVariant();
+ return QVariant::fromValue<ChatLineModel::WrapList>(_wrapList);
}
return MessageModelItem::data(column, role);
return false;
}
-void ChatLineModelItem::computeWordList() {
- QList<QPair<quint16, quint16> > wplist; // use a temp list which we'll later copy into a QVector for efficiency
+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;
- int flistidx = -1;
- int fmtend = -1;
- QFontMetricsF *metrics;
- QPair<quint16, quint16> wp(0, 0);
+ int idx, oldidx;
+ 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;
+ 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;
+ }
+ 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(idx < _contents.plainText.length());
+ } while(finder.isAtBoundary());
// A QVector needs less space than a QList
- _wordList.resize(wplist.count());
+ _wrapList.resize(wplist.count());
for(int i = 0; i < wplist.count(); i++) {
- _wordList[i] = wplist.at(i);
+ _wrapList[i] = wplist.at(i);
}
}