From 3af76aa86b74fe66f460cdfd3b49b0e5fd8fdb24 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 21 Dec 2019 19:01:47 +0000 Subject: [PATCH] take pixel size into account when creating QFont from string Signed-off-by: Ivailo Monev --- src/gui/text/qfont.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index db41e4e92..d2d6a2ad3 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -1975,12 +1975,14 @@ bool QFont::fromString(const QString &descrip) if (count > 1 && l[1].toDouble() > 0.0) setPointSizeF(l[1].toDouble()); if (count == 9) { - setStyleHint((StyleHint) l[2].toInt()); - setWeight(qMax(qMin(99, l[3].toInt()), 0)); - setItalic(l[4].toInt()); - setUnderline(l[5].toInt()); - setStrikeOut(l[6].toInt()); - setFixedPitch(l[7].toInt()); + if (l[2].toInt() > 0) + setPixelSize(l[2].toInt()); + setStyleHint((StyleHint) l[3].toInt()); + setWeight(qMax(qMin(99, l[4].toInt()), 0)); + setItalic(l[5].toInt()); + setUnderline(l[6].toInt()); + setStrikeOut(l[7].toInt()); + setFixedPitch(l[8].toInt()); if (!d->request.fixedPitch) // assume 'false' fixedPitch equals default d->request.ignorePitch = true; -- 2.11.0