2 files changed, 11 insertions, 2 deletions
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
index 683b7f65ad..6f2755a05a 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
@@ -355,6 +355,13 @@ void QWindowsFontEngineDirectWrite::collectMetrics()
         m_faceId.filename = QFile::encodeName(filenameFromFontFile(fontFile));
         fontFile->Release();
     }
+
+    QByteArray table = getSfntTable(MAKE_TAG('h', 'h', 'e', 'a'));
+    const int advanceWidthMaxLocation = 10;
+    if (table.size() >= advanceWidthMaxLocation + sizeof(quint16)) {
+        quint16 advanceWidthMax = qFromBigEndian<quint16>(table.constData() + advanceWidthMaxLocation);
+        m_maxAdvanceWidth = DESIGN_TO_LOGICAL(advanceWidthMax);
+    }
 }
 
 QFixed QWindowsFontEngineDirectWrite::underlinePosition() const
@@ -607,8 +614,9 @@ QFixed QWindowsFontEngineDirectWrite::xHeight() const
 
 qreal QWindowsFontEngineDirectWrite::maxCharWidth() const
 {
-    // ###
-    return 0;
+    return fontDef.styleStrategy & QFont::ForceIntegerMetrics
+           ? m_maxAdvanceWidth.round().toReal()
+           : m_maxAdvanceWidth.toReal();
 }
 
 QImage QWindowsFontEngineDirectWrite::alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t)
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h
index 65b16b9ba7..db4e79e44f 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h
@@ -143,6 +143,7 @@ private:
     QFixed m_descent;
     QFixed m_xHeight;
     QFixed m_lineGap;
+    QFixed m_maxAdvanceWidth;
     FaceId m_faceId;
     QString m_uniqueFamilyName;
 };