Merge pull request #9085 from Techjar/better-monospace

Qt: Use better method of getting default monospace font
dolphin-emu · Sep 15, 2020 · 9e3c083 · 9e3c083
2 parents f042251 + 0759ead
commit 9e3c083
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Source/Core/DolphinQt/Config/LogWidget.cpp b/Source/Core/DolphinQt/Config/LogWidget.cpp
@@ -119,8 +119,7 @@ void LogWidget::UpdateFont()
   case 0:  // Default font
     break;
   case 1:  // Monospace font
-    f = QFont(QStringLiteral("Monospace"));
-    f.setStyleHint(QFont::TypeWriter);
+    f = QFont(QFontDatabase::systemFont(QFontDatabase::FixedFont).family());
     break;
   case 2:  // Debugger font
     f = Settings::Instance().GetDebugFont();

diff --git a/Source/Core/DolphinQt/Settings.cpp b/Source/Core/DolphinQt/Settings.cpp
@@ -8,6 +8,7 @@
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
+#include <QFontDatabase>
 #include <QSize>
 
 #include "AudioCommon/AudioCommon.h"
@@ -489,8 +490,7 @@ void Settings::SetDebugFont(QFont font)
 
 QFont Settings::GetDebugFont() const
 {
-  QFont default_font = QFont(QStringLiteral("Monospace"));
-  default_font.setStyleHint(QFont::TypeWriter);
+  QFont default_font = QFont(QFontDatabase::systemFont(QFontDatabase::FixedFont).family());
 
   return GetQSettings().value(QStringLiteral("debugger/font"), default_font).value<QFont>();
 }