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

Fix problem with null font name. Forced default font for Mac will be Helvetica.

Browse Source
This commit is contained in:
Seeker4 2019-07-10 21:35:14 -07:00
parent 01f98d1583
commit 5bf71e2a55
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oscar/SleepLib/common.cpp
View File

@ -324,7 +324,7 @@ void validateFont (QString which, int size, bool bold, bool italic) {
// We already have a font, so it becomes desired font (if valid) // We already have a font, so it becomes desired font (if valid)
QString testFont = (*p_pref)[prefPrefix + "Name"].toString(); QString testFont = (*p_pref)[prefPrefix + "Name"].toString();
// Is this a good font? // Is this a good font?
if (installedFontFamilies.indexOf(testFont) >= 0) { if (testFont.length() > 0 && installedFontFamilies.indexOf(testFont) >= 0) {
desiredFont = testFont; desiredFont = testFont;
forceFont = false; forceFont = false;
} }
@ -333,7 +333,7 @@ void validateFont (QString which, int size, bool bold, bool italic) {
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
// Don't allow private font to be set for anything other than Application font (Mac restricts use to UI) // Don't allow private font to be set for anything other than Application font (Mac restricts use to UI)
if (which != "Application" && fontdatabase.isPrivateFamily(desiredFont)) { if (which != "Application" && fontdatabase.isPrivateFamily(desiredFont)) {
desiredFont = "Arial"; // We assume "Arial" is universally available on Mac desiredFont = "Helvetica"; // We assume "Helvetica" is universally available on Mac
forceFont = true; forceFont = true;
} }
#endif #endif