From 2e6cdd6de932402d5a4352b5de6a7f48379d127f Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Fri, 21 Jun 2019 11:49:55 -0400 Subject: [PATCH] Fix conflict between private fonts and QFontComboBox. This fixes an issue where the default application font on macOS would get reset if a user saved their preferences. --- oscar/preferencesdialog.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/oscar/preferencesdialog.cpp b/oscar/preferencesdialog.cpp index c2965220..6aeed395 100644 --- a/oscar/preferencesdialog.cpp +++ b/oscar/preferencesdialog.cpp @@ -1,5 +1,6 @@ -/* OSCAR Preferences Dialog Implementation +/* OSCAR Preferences Dialog Implementation * + * Copyright (c) 2019 The OSCAR Team * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public @@ -165,7 +166,16 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : ui->LockSummarySessionSplitting->setChecked(profile->session->lockSummarySessions()); - ui->applicationFont->setCurrentFont(QApplication::font()); + // macOS default system fonts are not in QFontCombobox because they are "private": + // See https://github.com/musescore/MuseScore/commit/0eecb165664a0196c2eee12e42fb273dcfc9c637 + // The below makes sure any default system font is present in QFontComboBox. + QString systemFontFamily = QFontDatabase::systemFont(QFontDatabase::GeneralFont).family(); + if (-1 == ui->applicationFont->findText(systemFontFamily)) { + ui->applicationFont->addItem(systemFontFamily); + } + // If the current font is the system font, setCurrentFont() won't work as intended, + // so select the font by searching for its name, which will always work. + ui->applicationFont->setCurrentIndex(ui->applicationFont->findText(QApplication::font().family())); //ui->applicationFont->setFont(QApplication::font()); ui->applicationFontSize->setValue(QApplication::font().pointSize()); ui->applicationFontBold->setChecked(QApplication::font().weight() == QFont::Bold);