Merge 15587b4 into merged_master (Bitcoin PR bitcoin-core/gui#448)

MichealSD13 · May 10, 2023 · 7aeb30e · 7aeb30e
2 parents e9f3944 + 15587b4
commit 7aeb30e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -45,7 +45,6 @@
 
 #include <QApplication>
 #include <QDebug>
-#include <QFontDatabase>
 #include <QLatin1String>
 #include <QLibraryInfo>
 #include <QLocale>
@@ -469,7 +468,7 @@ int GuiMain(int argc, char* argv[])
 #endif
 
     BitcoinApplication app;
-    QFontDatabase::addApplicationFont(":/fonts/monospace");
+    GUIUtil::LoadFont(QStringLiteral(":/fonts/monospace"));
 
     /// 2. Parse command-line options. We do this after qt in order to show an error if there are problems parsing these
     // Command-line options take precedence:

diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -279,6 +279,12 @@ bool hasEntryData(const QAbstractItemView *view, int column, int role)
     return !selection.at(0).data(role).toString().isEmpty();
 }
 
+void LoadFont(const QString& file_name)
+{
+    const int id = QFontDatabase::addApplicationFont(file_name);
+    assert(id != -1);
+}
+
 QString getDefaultDataDirectory()
 {
     return boostPathToQString(GetDefaultDataDir());

diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
@@ -115,6 +115,11 @@ namespace GUIUtil
 
     void setClipboard(const QString& str);
 
+    /**
+     * Loads the font from the file specified by file_name, aborts if it fails.
+     */
+    void LoadFont(const QString& file_name);
+
     /**
      * Determine default data directory for operating system.
      */