chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not allow private font to be used for other than Application on MacOS

Browse Source
This commit is contained in:
Seeker4 2019-07-10 15:13:27 -07:00
parent a382733d7c
commit be9ce5085b
2 changed files with 35 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
oscar/SleepLib/common.cpp
View File

@ -295,67 +295,55 @@ static QStringList installedFontFamilies;
// Validate all fonts // Validate all fonts
void validateAllFonts () { void validateAllFonts () {
validateFont("Application"); validateFont("Application", 10, false, false);
validateFont("Graph"); validateFont("Graph", 10, false, false);
validateFont("Title"); validateFont("Title", 12, true, false);
validateFont("Big"); validateFont("Big", 35, false, false);
} }
// Validate font from preference settings, and substitute system font if font in preferences cannot be found on this system // Validate font from preference settings, and substitute system font if font in preferences cannot be found on this system
void validateFont (QString which) { void validateFont (QString which, int size, bool bold, bool italic) {
// Get list of installed font families, including system font // Get list of installed font families, including system font
// Do this just once so we don't have to call font functions repeatedly // Do this just once so we don't have to call font functions repeatedly
if (installedFontFamilies.length() <= 0) { // (This list includes private fonts)
QFontDatabase database; QFontDatabase fontdatabase;
installedFontFamilies = database.families(); if (installedFontFamilies.isEmpty()) {
qDebug() << "validateFont found" << installedFontFamilies.count() << "families"; installedFontFamilies = fontdatabase.families();
qDebug() << "validateFont found" << installedFontFamilies.count() << "installed font families";
// 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 installedFontFamilies
QString systemFontFamily = QFontDatabase::systemFont(QFontDatabase::GeneralFont).family();
if (installedFontFamilies.indexOf(systemFontFamily) < 0) {
installedFontFamilies.insert(0, systemFontFamily);
} }
}
bool forceFont = false;
QString prefPrefix = "Fonts_" + which + "_"; QString prefPrefix = "Fonts_" + which + "_";
// start off assuming we don't have a font specified, and system font is desired font
QString desiredFont = QFontDatabase::systemFont(QFontDatabase::GeneralFont).family();
bool forceFont = true;
// If a font is specified, make sure it is a valid font on this platform // If a font is specified, make sure it is a valid font on this platform
if (p_pref->contains(prefPrefix + "Name")) { if (p_pref->contains(prefPrefix + "Name")) {
QString desiredFont = (*p_pref)[prefPrefix + "Name"].toString(); // We already have a font, so it becomes desired font (if valid)
if (desiredFont == "") QString testFont = (*p_pref)[prefPrefix + "Name"].toString();
forceFont = true; // Is this a good font?
else { if (installedFontFamilies.indexOf(testFont) >= 0) {
if (installedFontFamilies.indexOf(desiredFont) == -1) { desiredFont = testFont;
forceFont = true; forceFont = false;
qDebug() << "Desired font" << desiredFont << "not found in font database," << QFontDatabase::systemFont(QFontDatabase::GeneralFont) << "(system default) font used instead";
}
} }
} }
// Font not valid or not specified. Set system font in its place #ifdef Q_OS_MAC
if (!p_pref->contains(prefPrefix + "Name") || forceFont) { // Don't allow private font to be set for anything other than Application font (Mac restricts use to UI)
(*p_pref)[prefPrefix + "Name"] = QFontDatabase::systemFont(QFontDatabase::GeneralFont).family(); if (which != "Application" && fontdatabase.isPrivateFamily(desiredFont)) {
if (which == "Application") { desiredFont = "Arial"; // We assume "Arial" is universally available on Mac
(*p_pref)[prefPrefix + "Size"] = 10; forceFont = true;
(*p_pref)[prefPrefix + "Bold"] = false; }
(*p_pref)[prefPrefix + "Italic"] = false; #endif
} else if (which == "Graphs") {
(*p_pref)[prefPrefix + "Size"] = 10; // Font not valid or not specified. Set a default font in its place
(*p_pref)[prefPrefix + "Bold"] = false; if (forceFont) {
(*p_pref)[prefPrefix + "Italic"] = false; (*p_pref)[prefPrefix + "Name"] = desiredFont;
} else if (which == "Title") { (*p_pref)[prefPrefix + "Size"] = size;
(*p_pref)[prefPrefix + "Size"] = 14; (*p_pref)[prefPrefix + "Bold"] = bold;
(*p_pref)[prefPrefix + "Bold"] = true; (*p_pref)[prefPrefix + "Italic"] = italic;
(*p_pref)[prefPrefix + "Italic"] = false;
} else if (which == "Big") {
(*p_pref)[prefPrefix + "Size"] = 35;
(*p_pref)[prefPrefix + "Bold"] = false;
(*p_pref)[prefPrefix + "Italic"] = false;
}
} }
} }

2
oscar/SleepLib/common.h
View File

@ -144,7 +144,7 @@ const QString getDeveloperDomain();
const QString getModifiedAppData(); const QString getModifiedAppData();
void validateAllFonts (); void validateAllFonts ();
void validateFont (QString which); void validateFont (QString which, int size, bool bold, bool italic);
void setApplicationFont (); void setApplicationFont ();
void initializeStrings(); void initializeStrings();