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

Make QTextEngine::setAdditionalFormats() invalidate cached results

Browse Source 
...which ensures we're not getting the formatting/rendering
artefacts in case of QStackTextEngine.

Change-Id: Ia0696a3e67eb866cf9776c6649c43775944edd1d
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Konstantin Ritt 2014-03-15 01:20:36 +02:00 committed by The Qt Project
parent 946c092554
commit 4f2872c64f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2374,6 +2374,7 @@ void QTextEngine::freeMemory()
layoutData->hasBidi = false; layoutData->hasBidi = false;
layoutData->layoutState = LayoutEmpty; layoutData->layoutState = LayoutEmpty;
layoutData->haveCharAttributes = false; layoutData->haveCharAttributes = false;
layoutData->items.clear();
} }
for (int i = 0; i < lines.size(); ++i) { for (int i = 0; i < lines.size(); ++i) {
lines[i].justified = 0; lines[i].justified = 0;
@ -2520,7 +2521,8 @@ void QTextEngine::setAdditionalFormats(const QList<QTextLayout::FormatRange> &fo
specialData->addFormats = formatList; specialData->addFormats = formatList;
indexAdditionalFormats(); indexAdditionalFormats();
} }
resetFontEngineCache(); invalidate();
clearLineData();
} }
void QTextEngine::indexAdditionalFormats() void QTextEngine::indexAdditionalFormats()