From f2938995c1e1a42ebdd9f1ba11b2201408899f2f Mon Sep 17 00:00:00 2001
From: nerix <nerixdev@outlook.de>
Date: Sat, 22 Apr 2023 23:42:17 +0200
Subject: [PATCH] More Accurately Convert Font-Weights in Qt 6 (#4568)

Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
---
 CHANGELOG.md             |  2 +-
 src/singletons/Fonts.cpp | 40 ++++++++++++++++++++++++++++++++++++----
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b9c94fcb..50d0f99aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@
 - Bugfix: Fixed an issue where it was difficult to hover a zero-width emote. (#4314)
 - Bugfix: Fixed an issue where context-menu items for zero-width emotes displayed the wrong provider. (#4460)
 - Bugfix: Fixed an issue where the "Enable zero-width emotes" setting was showing the inverse state. (#4462)
-- Bugfix: Fixed username rendering in Qt 6. (#4476)
+- Bugfix: Fixed username rendering in Qt 6. (#4476, #4568)
 - Bugfix: Fixed placeholder color in Qt 6. (#4477)
 - Bugfix: Fixed blocked user list being empty when opening the settings dialog for the first time. (#4437)
 - Bugfix: Fixed blocked user list sticking around when switching from a logged in user to being logged out. (#4437)
diff --git a/src/singletons/Fonts.cpp b/src/singletons/Fonts.cpp
index d5325cdd0..79f1319f7 100644
--- a/src/singletons/Fonts.cpp
+++ b/src/singletons/Fonts.cpp
@@ -26,10 +26,42 @@ namespace {
     int getBoldness()
     {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-        // This setting uses the Qt 5 range of the font-weight (0..99).
-        // The range in Qt 6 is 1..1000.
-        return (int)(1.0 +
-                     (111.0 * getSettings()->boldScale.getValue()) / 11.0);
+        // From qfont.cpp
+        // https://github.com/qt/qtbase/blob/589c6d066f84833a7c3dda1638037f4b2e91b7aa/src/gui/text/qfont.cpp#L143-L169
+        static constexpr std::array<std::array<int, 2>, 9> legacyToOpenTypeMap{{
+            {0, QFont::Thin},
+            {12, QFont::ExtraLight},
+            {25, QFont::Light},
+            {50, QFont::Normal},
+            {57, QFont::Medium},
+            {63, QFont::DemiBold},
+            {75, QFont::Bold},
+            {81, QFont::ExtraBold},
+            {87, QFont::Black},
+        }};
+
+        const int target = getSettings()->boldScale.getValue();
+
+        int result = QFont::Medium;
+        int closestDist = INT_MAX;
+
+        // Go through and find the closest mapped value
+        for (const auto [weightOld, weightNew] : legacyToOpenTypeMap)
+        {
+            const int dist = qAbs(weightOld - target);
+            if (dist < closestDist)
+            {
+                result = weightNew;
+                closestDist = dist;
+            }
+            else
+            {
+                // Break early since following values will be further away
+                break;
+            }
+        }
+
+        return result;
 #else
         return getSettings()->boldScale.getValue();
 #endif