projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b2db259
)
Fix glyph position issue with fallback fonts
author
Jiang Jiang
<jiang.jiang@nokia.com>
Fri, 29 Apr 2011 07:58:30 +0000
(09:58 +0200)
committer
Jiang Jiang
<jiang.jiang@nokia.com>
Fri, 29 Apr 2011 08:09:13 +0000
(10:09 +0200)
Task-number: QTBUG-18933
Reviewed-by: Eskil
(cherry picked from commit
18fcbf7ae41504324cd453ba9b9655f3e94f6495
)
src/gui/text/qtextlayout.cpp
patch
|
blob
|
history
diff --git
a/src/gui/text/qtextlayout.cpp
b/src/gui/text/qtextlayout.cpp
index
93f71d3
..
fe0c53a
100644
(file)
--- a/
src/gui/text/qtextlayout.cpp
+++ b/
src/gui/text/qtextlayout.cpp
@@
-2317,6
+2317,9
@@
QList<QGlyphs> QTextLine::glyphs(int from, int length) const
QGlyphLayout subLayout = glyphLayout.mid(start, end - start);
glyphLayoutHash.insertMulti(multiFontEngine->engine(which),
GlyphInfo(subLayout, pos, flags));
+ for (int i = 0; i < subLayout.numGlyphs; i++)
+ pos += QPointF(subLayout.advances_x[i].toReal(),
+ subLayout.advances_y[i].toReal());
start = end;
which = e;