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

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

Browse Source 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix QRawFont::setPixelSize() on Mac
This commit is contained in:
Qt Continuous Integration System 2011-05-07 00:05:46 +10:00
commit de47cd9b66
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/text/qfontengine_coretext.mm
View File

@ -871,7 +871,7 @@ QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const
newFontDef.pixelSize = pixelSize; newFontDef.pixelSize = pixelSize;
newFontDef.pointSize = pixelSize * 72.0 / qt_defaultDpi(); newFontDef.pointSize = pixelSize * 72.0 / qt_defaultDpi();
return new QCoreTextFontEngine(cgFont, fontDef); return new QCoreTextFontEngine(cgFont, newFontDef);
} }
QT_END_NAMESPACE QT_END_NAMESPACE

36
tests/auto/qrawfont/tst_qrawfont.cpp
View File

@ -91,6 +91,9 @@ private slots:
void unsupportedWritingSystem_data(); void unsupportedWritingSystem_data();
void unsupportedWritingSystem(); void unsupportedWritingSystem();
void rawFontSetPixelSize_data();
void rawFontSetPixelSize();
#endif // QT_NO_RAWFONT #endif // QT_NO_RAWFONT
}; };
@ -807,6 +810,39 @@ void tst_QRawFont::unsupportedWritingSystem()
fontDatabase.removeApplicationFont(id); fontDatabase.removeApplicationFont(id);
} }
void tst_QRawFont::rawFontSetPixelSize_data()
{
QTest::addColumn<QFont::HintingPreference>("hintingPreference");
QTest::newRow("Default hinting preference") << QFont::PreferDefaultHinting;
QTest::newRow("No hinting preference") << QFont::PreferNoHinting;
QTest::newRow("Vertical hinting preference") << QFont::PreferVerticalHinting;
QTest::newRow("Full hinting preference") << QFont::PreferFullHinting;
}
void tst_QRawFont::rawFontSetPixelSize()
{
QFETCH(QFont::HintingPreference, hintingPreference);
QTextLayout layout("Foobar");
QFont font = layout.font();
font.setHintingPreference(hintingPreference);
font.setPixelSize(12);
layout.setFont(font);
layout.beginLayout();
layout.createLine();
layout.endLayout();
QGlyphs glyphs = layout.glyphs().at(0);
QRawFont rawFont = glyphs.font();
QCOMPARE(rawFont.pixelSize(), 12.0);
rawFont.setPixelSize(24);
QCOMPARE(rawFont.pixelSize(), 24.0);
}
#endif // QT_NO_RAWFONT #endif // QT_NO_RAWFONT
QTEST_MAIN(tst_QRawFont) QTEST_MAIN(tst_QRawFont)