AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regression in painted emoji offset

Browse Source 
Factor out translation from the matrix applied on bitmap glyphs,
as that gets applied as position when painted.

Task-number: QTBUG-64313
Change-Id: Iab8d995c00ee02eda0896242903312d837b6d790
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit 07fcfb793d)
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
This commit is contained in:
Allan Sandfeld Jensen 2017-11-24 11:41:32 +01:00 committed by Jani Heikkinen
parent b89fd42217
commit 4c03f2b79e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
View File

@ -1778,7 +1778,10 @@ QFixed QFontEngineFT::scaledBitmapMetrics(QFixed m) const
glyph_metrics_t QFontEngineFT::scaledBitmapMetrics(const glyph_metrics_t &m, const QTransform &t) const
{
QTransform trans(t);
QTransform trans;
trans.setMatrix(t.m11(), t.m12(), t.m13(),
t.m21(), t.m22(), t.m23(),
0, 0, t.m33());
const qreal scaleFactor = scalableBitmapScaleFactor.toReal();
trans.scale(scaleFactor, scaleFactor);