diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-05-07 11:54:30 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-11 12:33:09 +0000 |
| commit | 9b3bf5126bd42138cefa10d1ec24d3529517f88d (patch) | |
| tree | dc8b5c64eccdb80fad484db77072bbef28cc6c89 | |
| parent | 2b5bb740d2386453d2eb079f5676d97700a96230 (diff) | |
Fix unaligned specialData formats
Handle the case were a format was applied that does not align with
the fragments.
Change-Id: I27593a50c587a5ec0290ff9d0a7a9767a3981cac
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
(cherry picked from commit d93fac3290bc0890a529886a4f991daa77fd6a6e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 60f0853454..42d6118b4f 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -2011,10 +2011,15 @@ void QTextEngine::itemize() const : formatCollection()->defaultFont().capitalization(); if (s) { for (const auto &range : qAsConst(s->formats)) { - if (range.start >= prevPosition && range.start < position && range.format.hasProperty(QTextFormat::FontCapitalization)) { - itemizer.generate(prevPosition, range.start - prevPosition, capitalization); - itemizer.generate(range.start, range.length, range.format.fontCapitalization()); - prevPosition = range.start + range.length; + if (range.start + range.length <= prevPosition || range.start >= position) + continue; + if (range.format.hasProperty(QTextFormat::FontCapitalization)) { + if (range.start > prevPosition) + itemizer.generate(prevPosition, range.start - prevPosition, capitalization); + int newStart = std::max(prevPosition, range.start); + int newEnd = std::min(position, range.start + range.length); + itemizer.generate(newStart, newEnd - newStart, range.format.fontCapitalization()); + prevPosition = newEnd; } } } |