diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2010-09-22 09:04:25 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2010-09-22 09:05:02 (GMT) |
| commit | 709eea77bf6e7b4539ae5268b5c2811a1551b1b0 (patch) | |
| tree | b3b8f9234349f9d647db8d83363326ebdee54984 | |
| parent | dbe4dd5262c7ae7b4c61bddc7b8d9b895b462b32 (diff) | |
| download | Qt-709eea77bf6e7b4539ae5268b5c2811a1551b1b0.zip Qt-709eea77bf6e7b4539ae5268b5c2811a1551b1b0.tar.gz Qt-709eea77bf6e7b4539ae5268b5c2811a1551b1b0.tar.bz2 | |
Revert "Keep other text format with QTextOption::SuppressColors tag on"
This reverts commit 22ee6863458885c900e8294a44bd782acbdd8201.
| -rw-r--r-- | src/gui/text/qtextlayout.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index a7f619e..f432b7e 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -2219,12 +2219,8 @@ void QTextLine::draw(QPainter *p, const QPointF &pos, const QTextLayout::FormatR QTextCharFormat format; if (eng->hasFormats() || selection) { - format = eng->format(&si); - if (suppressColors) { - format.clearForeground(); - format.clearBackground(); - format.clearProperty(QTextFormat::TextUnderlineColor); - } + if (!suppressColors) + format = eng->format(&si); if (selection) format.merge(selection->format); |