Skip to content

qt: Call GUIUtil::loadFonts earlier #3593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UdjinM6 merged 2 commits into from
Jul 8, 2020
Merged

qt: Call GUIUtil::loadFonts earlier #3593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a473f2
qt: Call GUIUtil::loadFonts earlier.
xdustinface Jul 8, 2020
c950f0b
Apply review suggestion
xdustinface Jul 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/qt/dash.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,6 @@ bool BitcoinCore::baseInitialize()
{
return false;
}
if (!GUIUtil::loadFonts()) {
return false;
}
return true;
}

Expand Down Expand Up @@ -693,7 +690,12 @@ int main(int argc, char *argv[])
app.parameterSetup();
// Load GUI settings from QSettings
app.createOptionsModel(gArgs.GetBoolArg("-resetguisettings", false));

// Load custom application fonts and setup font management
if (!GUIUtil::loadFonts()) {
QMessageBox::critical(0, QObject::tr(PACKAGE_NAME),
QObject::tr("Error: Failed to load application fonts."));
return EXIT_FAILURE;
}
// Validate/set font family
if (gArgs.IsArgSet("-font-family")) {
GUIUtil::FontFamily family;
Expand Down
2 changes: 1 addition & 1 deletion src/qt/guiutil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1183,7 +1183,7 @@ bool loadFonts()

// Fail if an added id is -1 which means QFontDatabase::addApplicationFont failed.
if (std::find(vecFontIds.begin(), vecFontIds.end(), -1) != vecFontIds.end()) {
return InitError("Font loading failed.");
return false;
}

// Print debug logs for added fonts fetched by the added ids
Expand Down