diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-11-25 14:46:43 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-11-25 15:01:25 (GMT) |
| commit | a51a29e9f7b63fcefcdf9e9069e219726db1250e (patch) | |
| tree | 0ac2d6bf356ff4436a6bb634d75d3605e05ef516 /src/gui/painting | |
| parent | ea814440efc8a4b956ba3a4cddd1f269f1734c96 (diff) | |
| download | Qt-a51a29e9f7b63fcefcdf9e9069e219726db1250e.zip Qt-a51a29e9f7b63fcefcdf9e9069e219726db1250e.tar.gz Qt-a51a29e9f7b63fcefcdf9e9069e219726db1250e.tar.bz2 | |
Fix possible artifacts under glyphs in texture glyph cache
We would disregard the first glyph in each line when calculating the
required height of the line in the glyph cache. If the first glyph
was taller than any of the other glyphs in the same line, the glyph
drawn underneath it in the cache could potentially overlap it, and
you would see it as dots or lines underneath the glyph in the output.
Task-number: QTBUG-14806
Reviewed-by: Jiang Jiang
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qtextureglyphcache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp index 2daa1f0..eab9cf6 100644 --- a/src/gui/painting/qtextureglyphcache.cpp +++ b/src/gui/painting/qtextureglyphcache.cpp @@ -143,7 +143,7 @@ bool QTextureGlyphCache::populate(QFontEngine *fontEngine, int numGlyphs, const // no room on the current line, start new glyph strip m_cx = 0; m_cy += m_currentRowHeight + paddingDoubled; - m_currentRowHeight = 0; // New row + m_currentRowHeight = c.h + margin * 2; // New row } } if (m_cy + c.h > m_h) { |