- 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;