Font Database: Add support for private, system UI font families

We introduce QPlatformFontDatabase::isPrivateFontFamily() to allow
testing for private, system UI font families. Both QFontComboBox
and QFontDialog need to filter out those private font families
which, by definition, should be hidden from the end user.

(The textedit example had to be updated to fix the issue where the
default font would be private. In 5.4, we will be adding an equivalent,
public API in QFontDatabase, and a better solution for the textedit
example and QTexEdit in general).

In particular, on OS X and iOS, private fonts are used for the system
UI font. Those have their font family name prefixed by a dot.
QCoreTextFontDatabase knows about this, and makes sure those are
tested positive as private font families. In order to have a cleaner
layer separation, we moved the QPA theme font resolution from the
platform theme classes into QCoreTextFontDatabase for both Cocoa and
iOS QPA plugins.

In both cases, we use CoreText's CTFontCreateUIFontForLanguage(), that
nicely maps to the HITheme API we were using so far on Mac. That means
one HITheme dependency less. We also cache the font descriptors we get
for these font for each time QCTFD::populateFamilies() gets called.
(While not common, this currently happens in auto-tests, like
tst_QFontDatabase, and could happen in actual applications -- specially
when adding and removing application fonts.)

Change-Id: Ic6f0b60f9f597afee1a43596a669742dc546b97f
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>

1 files changed, 11 insertions, 0 deletions

diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
index c73f4a32ca..a3da27b28d 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
@@ -47,6 +47,7 @@
 #define HAVE_ATS QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_5, __IPHONE_NA)
 
 #include <qpa/qplatformfontdatabase.h>
+#include <qpa/qplatformtheme.h>
 #include <private/qcore_mac_p.h>
 
 #ifndef Q_OS_IOS
@@ -66,6 +67,8 @@ Q_DECLARE_METATYPE(ATSFontContainerRef);
 
 QT_BEGIN_NAMESPACE
 
+struct FontDescription;
+
 class QCoreTextFontDatabase : public QPlatformFontDatabase
 {
 public:
@@ -79,17 +82,25 @@ public:
     QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const;
     QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName);
     void releaseHandle(void *handle);
+    bool isPrivateFontFamily(const QString &family) const;
     QFont defaultFont() const;
     QList<int> standardSizes() const;
 
+    // For iOS and OS X platform themes
+    QFont *themeFont(QPlatformTheme::Font) const;
+    const QHash<QPlatformTheme::Font, QFont *> &themeFonts() const;
+
 private:
     void populateFromDescriptor(CTFontDescriptorRef font);
+    void populateFromFontDescription(CTFontDescriptorRef font, const FontDescription &fd);
 
     mutable QString defaultFontName;
 
     void removeApplicationFonts();
 
     QVector<QVariant> m_applicationFonts;
+    mutable QSet<CTFontDescriptorRef> m_systemFontDescriptors;
+    mutable QHash<QPlatformTheme::Font, QFont *> m_themeFonts;
 };
 
 QT_END_NAMESPACE