Store the font's scalability in QFontEngine.

This is an enabler to fallback to native font rendering when using a
bitmap font in Qt Quick.

Task-number: QTBUG-32737
Change-Id: I6d841dd5ef54d78a00f7fab9d80e9c95ff7f7b98
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
bb10
Yoann Lopes 2013-10-30 17:53:40 +01:00 committed by The Qt Project
parent e8f2c4d2cd
commit 65b12fbdb1
3 changed files with 5 additions and 1 deletions

View File

@ -184,6 +184,7 @@ QFontEngine *loadSingleEngine(int script,
if (!engine) {
engine = pfdb->fontEngine(def, QChar::Script(script), size->handle);
if (engine) {
engine->smoothScalable = style->smoothScalable;
QFontCache::Key key(def,script);
QFontCache::instance()->instance()->insertEngine(key,engine);
}

View File

@ -208,7 +208,8 @@ Q_AUTOTEST_EXPORT QList<QFontEngine *> QFontEngine_stopCollectingEngines()
QFontEngine::QFontEngine()
: ref(0),
font_(0), font_destroy_func(0),
face_(0), face_destroy_func(0)
face_(0), face_destroy_func(0),
smoothScalable(false)
{
cache_cost = 0;
fsType = 0;

View File

@ -302,6 +302,8 @@ public:
inline QVariant userData() const { return m_userData; }
bool smoothScalable;
protected:
QFixed lastRightBearing(const QGlyphLayout &glyphs, bool round = false);