1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unaligned specialData formats

Browse Source 
Handle the case were a format was applied that does not align with
the fragments.

Pick-to: 6.2 6.1 5.15
Change-Id: I27593a50c587a5ec0290ff9d0a7a9767a3981cac
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
This commit is contained in:
Allan Sandfeld Jensen 2021-05-07 11:54:30 +02:00
parent f5d6f8dca0
commit d93fac3290
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/text/qtextengine.cpp
View File

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