diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2020-10-17 14:18:42 +0300 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2020-10-28 17:27:37 +0300 |
| commit | bb8c24e467767e35cb104167689b96c0deea5639 (patch) | |
| tree | b0b21bbcaef9db39e5c7e13a984072d47f2b203d /src/printsupport | |
| parent | f9f2107cefff98fe5caf86e1a8174cbe38d29a63 (diff) | |
QFontEngine: get rid of userData() trickery
it is only used by QWin32PrintEngine and we know for sure
QWindowsFontEngine::handle() returns HFONT
Change-Id: I7656801e4642caf7df612d2f686061dca92707e0
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/printsupport')
| -rw-r--r-- | src/printsupport/platform/windows/qprintengine_win.cpp | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/src/printsupport/platform/windows/qprintengine_win.cpp b/src/printsupport/platform/windows/qprintengine_win.cpp index 3d00f2683c..017d99300d 100644 --- a/src/printsupport/platform/windows/qprintengine_win.cpp +++ b/src/printsupport/platform/windows/qprintengine_win.cpp @@ -64,9 +64,6 @@ #include <QtCore/qt_windows.h> #include <QtGui/qpagelayout.h> -Q_DECLARE_METATYPE(HFONT) -Q_DECLARE_METATYPE(LOGFONT) - QT_BEGIN_NAMESPACE Q_GUI_EXPORT HBITMAP qt_pixmapToWinHBITMAP(const QPixmap &p, int hbitmapFormat = 0); @@ -291,19 +288,16 @@ void QWin32PrintEngine::drawTextItem(const QPointF &p, const QTextItem &textItem bool fallBack = state->pen().brush().style() != Qt::SolidPattern || qAlpha(brushColor) != 0xff || d->txop >= QTransform::TxProject - || ti.fontEngine->type() != QFontEngine::Win || !d->embed_fonts; - if (!fallBack) { - const QVariantMap userData = ti.fontEngine->userData().toMap(); - const QVariant hFontV = userData.value(QStringLiteral("hFont")); - const QVariant logFontV = userData.value(QStringLiteral("logFont")); - if (hFontV.canConvert<HFONT>() && logFontV.canConvert<LOGFONT>()) { - const HFONT hfont = hFontV.value<HFONT>(); - const LOGFONT logFont = logFontV.value<LOGFONT>(); + if (!fallBack && ti.fontEngine->type() == QFontEngine::Win) { + if (HFONT hfont = static_cast<HFONT>(ti.fontEngine->handle())) { // Try selecting the font to see if we get a substitution font SelectObject(d->hdc, hfont); if (GetDeviceCaps(d->hdc, TECHNOLOGY) != DT_CHARSTREAM) { + LOGFONT logFont; + GetObject(hfont, sizeof(LOGFONT), &logFont); + wchar_t n[64]; GetTextFace(d->hdc, 64, n); fallBack = QString::fromWCharArray(n) @@ -1730,11 +1724,8 @@ static void draw_text_item_win(const QPointF &pos, const QTextItemInt &ti, HDC h HFONT hfont = 0; if (ti.fontEngine->type() == QFontEngine::Win) { - const QVariantMap userData = ti.fontEngine->userData().toMap(); - const QVariant hfontV = userData.value(QStringLiteral("hFont")); - const QVariant ttfV = userData.value(QStringLiteral("trueType")); - if (ttfV.toBool() && hfontV.canConvert<HFONT>()) - hfont = hfontV.value<HFONT>(); + if (ti.fontEngine->supportsTransformation(QTransform::fromScale(0.5, 0.5))) // is TrueType font? + hfont = static_cast<HFONT>(ti.fontEngine->handle()); } if (!hfont) |