1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OSX FreeType: Add support for sub pixel font rendering.

Browse Source 
Task-number: QTBUG-42839
Change-Id: Iea4552d766936a55fd177e4287591d2715202d9c
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
This commit is contained in:
Sérgio Martins 2014-12-10 13:42:45 +00:00
parent ea3e2ca6ea
commit 385202c27c
4 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/text/qfontengine_ft_p.h
View File

@ -307,6 +307,7 @@ private:
friend class QFontEngineFTRawFont; friend class QFontEngineFTRawFont;
friend class QFontconfigDatabase; friend class QFontconfigDatabase;
friend class QBasicFontDatabase; friend class QBasicFontDatabase;
friend class QCoreTextFontDatabase;
friend class QFontEngineMultiFontConfig; friend class QFontEngineMultiFontConfig;
int loadFlags(QGlyphSet *set, GlyphFormat format, int flags, bool &hsubpixel, int &vfactor) const; int loadFlags(QGlyphSet *set, GlyphFormat format, int flags, bool &hsubpixel, int &vfactor) const;

14
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
View File

@ -986,10 +986,20 @@ QFontEngine *QCoreTextFontDatabase::freeTypeFontEngine(const QFontDef &fontDef,
QFontEngine::FaceId faceId; QFontEngine::FaceId faceId;
faceId.filename = filename; faceId.filename = filename;
const bool antialias = !(fontDef.styleStrategy & QFont::NoAntialias); const bool antialias = !(fontDef.styleStrategy & QFont::NoAntialias);
const QFontEngineFT::GlyphFormat format = antialias ? QFontEngineFT::Format_A8
: QFontEngineFT::Format_Mono;
QScopedPointer<QFontEngineFT> engine(new QFontEngineFT(fontDef)); QScopedPointer<QFontEngineFT> engine(new QFontEngineFT(fontDef));
QFontEngineFT::GlyphFormat format = QFontEngineFT::Format_Mono;
if (antialias) {
QFontEngine::SubpixelAntialiasingType subpixelType = subpixelAntialiasingTypeHint();
if (subpixelType == QFontEngine::Subpixel_None || (fontDef.styleStrategy & QFont::NoSubpixelAntialias)) {
format = QFontEngineFT::Format_A8;
engine->subpixelType = QFontEngine::Subpixel_None;
} else {
format = QFontEngineFT::Format_A32;
engine->subpixelType = subpixelType;
}
}
if (!engine->init(faceId, antialias, format, fontData) || engine->invalid()) { if (!engine->init(faceId, antialias, format, fontData) || engine->invalid()) {
qWarning() << "QCoreTextFontDatabase::freeTypefontEngine Failed to create engine"; qWarning() << "QCoreTextFontDatabase::freeTypefontEngine Failed to create engine";
return Q_NULLPTR; return Q_NULLPTR;

1
src/plugins/platforms/cocoa/qcocoaintegration.h
View File

@ -73,6 +73,7 @@ public:
QPlatformCursor *cursor() const Q_DECL_OVERRIDE { return m_cursor; } QPlatformCursor *cursor() const Q_DECL_OVERRIDE { return m_cursor; }
QWindow *topLevelAt(const QPoint &point) const Q_DECL_OVERRIDE; QWindow *topLevelAt(const QPoint &point) const Q_DECL_OVERRIDE;
QList<QPlatformScreen *> virtualSiblings() const Q_DECL_OVERRIDE { return m_siblings; } QList<QPlatformScreen *> virtualSiblings() const Q_DECL_OVERRIDE { return m_siblings; }
QPlatformScreen::SubpixelAntialiasingType subpixelAntialiasingTypeHint() const Q_DECL_OVERRIDE;
// ---------------------------------------------------- // ----------------------------------------------------
// Additional methods // Additional methods

10
src/plugins/platforms/cocoa/qcocoaintegration.mm
View File

@ -142,6 +142,16 @@ qreal QCocoaScreen::devicePixelRatio() const
return qreal(screen ? [screen backingScaleFactor] : 1.0); return qreal(screen ? [screen backingScaleFactor] : 1.0);
} }
QPlatformScreen::SubpixelAntialiasingType QCocoaScreen::subpixelAntialiasingTypeHint() const
{
QPlatformScreen::SubpixelAntialiasingType type = QPlatformScreen::subpixelAntialiasingTypeHint();
if (type == QPlatformScreen::Subpixel_None) {
// Every OSX machine has RGB pixels unless a peculiar or rotated non-Apple screen is attached
type = QPlatformScreen::Subpixel_RGB;
}
return type;
}
QWindow *QCocoaScreen::topLevelAt(const QPoint &point) const QWindow *QCocoaScreen::topLevelAt(const QPoint &point) const
{ {
NSPoint screenPoint = qt_mac_flipPoint(point); NSPoint screenPoint = qt_mac_flipPoint(point);