From: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Date: Thu, 19 Jul 2018 21:04:44 +0000 (+0200)
Subject: QtUiStyle: Support more font weights
X-Git-Tag: 0.13-rc2~88
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=c95649029bee1418b77ea2028f06b850759c7423

QtUiStyle: Support more font weights

The chosen expression is more or less an inverse of the CSS weights to
QFont::Weight translation in the QssParser.
---

diff --git a/src/qtui/qtuistyle.cpp b/src/qtui/qtuistyle.cpp
index f8e56aa3..7516c224 100644
--- a/src/qtui/qtuistyle.cpp
+++ b/src/qtui/qtuistyle.cpp
@@ -215,15 +215,16 @@ QString QtUiStyle::color(const QString &key, UiSettings &settings, const QColor
 
 QString QtUiStyle::fontDescription(const QFont &font) const
 {
-    QString desc = "font: ";
-    if (font.italic())
-        desc += "italic ";
-    if (font.bold())
-        desc += "bold ";
-    if (!font.italic() && !font.bold())
-        desc += "normal ";
-    desc += QString("%1pt \"%2\"").arg(font.pointSize()).arg(font.family());
-    return desc;
+    QFont::Style style = font.style();
+    int weight = font.weight();
+
+    return QString("font: %1 %2 %3pt \"%4\"")
+        .arg(style == QFont::StyleItalic  ? "italic"  :
+             style == QFont::StyleOblique ? "oblique" :
+                                            "normal")
+        .arg(100 * qBound(1, (weight * 8 + 50) / 100, 9))
+        .arg(font.pointSize())
+        .arg(font.family());
 }