diff options
| author | LC <mathew1800@gmail.com> | 2020-09-15 05:01:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-15 05:01:15 -0400 |
| commit | 9e3c08394ad6c05232dbacf7f1745570b5e2b48a (patch) | |
| tree | 9fd307b062a88d557fe0e4db25f1e62c6fa67f3f /Source/Core | |
| parent | f0422512e6a727e8097a3b556ea59cee245bd7d8 (diff) | |
| parent | 0759ead9b6946041ba5c4996d023ce7944bb35c5 (diff) | |
Merge pull request #9085 from Techjar/better-monospace
Qt: Use better method of getting default monospace font
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinQt/Config/LogWidget.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/DolphinQt/Settings.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Source/Core/DolphinQt/Config/LogWidget.cpp b/Source/Core/DolphinQt/Config/LogWidget.cpp index 577916e67a..c7b3a3330d 100644 --- 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 index 1721912bb8..6cb3435bf5 100644 --- 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>(); } |