e28ae083d2
When showing a condensed font with AnyStretch, we should not apply any stretch to the font (and if a stretch is requested, we should calculate the actual stretch based on how much the font is already stretched or condensed). This usually works as expected, however, when using QFont::NoFontMerging as the style strategy, we would scale the glyph advances by the stretch of the font since the calculated stretch of the font engine would be overwritten by the actual stretch. In the case where we use font merging, this would be done for the multi engine, so we would not get the same issue, since the text engine gets the stretch from the actual font engine and this still has the original, calculated stretch set. Note on the test: We can't use testString() for this, since it contains a space, and the test font does not have a glyph for this, so we will end up merging a different font for the space, giving us a slightly different advance. [ChangeLog][QtGui][macOS] Fixed display of condensed fonts when NoFontMerging is in use. Task-number: QTBUG-63800 Change-Id: I5b05e0dbfc8ae4b5d10c621ecb0975f53fda9483 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
400 lines
12 KiB
C++
400 lines
12 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the test suite of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include <QtTest/QtTest>
|
|
|
|
#include <qfontdatabase.h>
|
|
#include <qfontinfo.h>
|
|
#include <qfontmetrics.h>
|
|
#include <qtextlayout.h>
|
|
#include <private/qrawfont_p.h>
|
|
#include <qpa/qplatformfontdatabase.h>
|
|
|
|
class tst_QFontDatabase : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
tst_QFontDatabase();
|
|
|
|
private slots:
|
|
void initTestCase();
|
|
void styles_data();
|
|
void styles();
|
|
|
|
void fixedPitch_data();
|
|
void fixedPitch();
|
|
|
|
#ifdef Q_OS_MAC
|
|
void trickyFonts_data();
|
|
void trickyFonts();
|
|
#endif
|
|
|
|
void widthTwoTimes_data();
|
|
void widthTwoTimes();
|
|
|
|
void addAppFont_data();
|
|
void addAppFont();
|
|
|
|
void aliases();
|
|
void fallbackFonts();
|
|
|
|
void condensedFontWidth();
|
|
void condensedFontWidthNoFontMerging();
|
|
void condensedFontMatching();
|
|
|
|
void rasterFonts();
|
|
void smoothFonts();
|
|
|
|
private:
|
|
QString m_ledFont;
|
|
QString m_testFont;
|
|
QString m_testFontCondensed;
|
|
};
|
|
|
|
tst_QFontDatabase::tst_QFontDatabase()
|
|
{
|
|
}
|
|
|
|
void tst_QFontDatabase::initTestCase()
|
|
{
|
|
m_ledFont = QFINDTESTDATA("LED_REAL.TTF");
|
|
m_testFont = QFINDTESTDATA("testfont.ttf");
|
|
m_testFontCondensed = QFINDTESTDATA("testfont_condensed.ttf");
|
|
QVERIFY(!m_ledFont.isEmpty());
|
|
QVERIFY(!m_testFont.isEmpty());
|
|
QVERIFY(!m_testFontCondensed.isEmpty());
|
|
}
|
|
|
|
void tst_QFontDatabase::styles_data()
|
|
{
|
|
QTest::addColumn<QString>("font");
|
|
|
|
QTest::newRow( "data0" ) << QString( "Times New Roman" );
|
|
}
|
|
|
|
void tst_QFontDatabase::styles()
|
|
{
|
|
QFETCH( QString, font );
|
|
|
|
QFontDatabase fdb;
|
|
QStringList styles = fdb.styles( font );
|
|
QStringList::Iterator it = styles.begin();
|
|
while ( it != styles.end() ) {
|
|
QString style = *it;
|
|
QString trimmed = style.trimmed();
|
|
++it;
|
|
|
|
QCOMPARE(style, trimmed);
|
|
}
|
|
}
|
|
|
|
void tst_QFontDatabase::fixedPitch_data()
|
|
{
|
|
QTest::addColumn<QString>("font");
|
|
QTest::addColumn<bool>("fixedPitch");
|
|
|
|
QTest::newRow( "Times New Roman" ) << QString( "Times New Roman" ) << false;
|
|
QTest::newRow( "Arial" ) << QString( "Arial" ) << false;
|
|
QTest::newRow( "Andale Mono" ) << QString( "Andale Mono" ) << true;
|
|
QTest::newRow( "Courier" ) << QString( "Courier" ) << true;
|
|
QTest::newRow( "Courier New" ) << QString( "Courier New" ) << true;
|
|
#ifndef Q_OS_MAC
|
|
QTest::newRow( "Script" ) << QString( "Script" ) << false;
|
|
QTest::newRow( "Lucida Console" ) << QString( "Lucida Console" ) << true;
|
|
QTest::newRow( "DejaVu Sans" ) << QString( "DejaVu Sans" ) << false;
|
|
QTest::newRow( "DejaVu Sans Mono" ) << QString( "DejaVu Sans Mono" ) << true;
|
|
#else
|
|
QTest::newRow( "Menlo" ) << QString( "Menlo" ) << true;
|
|
QTest::newRow( "Monaco" ) << QString( "Monaco" ) << true;
|
|
#endif
|
|
}
|
|
|
|
void tst_QFontDatabase::fixedPitch()
|
|
{
|
|
QFETCH(QString, font);
|
|
QFETCH(bool, fixedPitch);
|
|
|
|
QFontDatabase fdb;
|
|
if (!fdb.families().contains(font))
|
|
QSKIP("Font not installed");
|
|
|
|
QCOMPARE(fdb.isFixedPitch(font), fixedPitch);
|
|
|
|
QFont qfont(font);
|
|
QFontInfo fi(qfont);
|
|
QCOMPARE(fi.fixedPitch(), fixedPitch);
|
|
}
|
|
|
|
#ifdef Q_OS_MAC
|
|
void tst_QFontDatabase::trickyFonts_data()
|
|
{
|
|
QTest::addColumn<QString>("font");
|
|
|
|
QTest::newRow( "Geeza Pro" ) << QString( "Geeza Pro" );
|
|
}
|
|
|
|
void tst_QFontDatabase::trickyFonts()
|
|
{
|
|
QFETCH(QString, font);
|
|
|
|
QFontDatabase fdb;
|
|
if (!fdb.families().contains(font))
|
|
QSKIP( "Font not installed");
|
|
|
|
QFont qfont(font);
|
|
QFontInfo fi(qfont);
|
|
QCOMPARE(fi.family(), font);
|
|
}
|
|
#endif
|
|
|
|
void tst_QFontDatabase::widthTwoTimes_data()
|
|
{
|
|
QTest::addColumn<QString>("font");
|
|
QTest::addColumn<int>("pixelSize");
|
|
QTest::addColumn<QString>("text");
|
|
|
|
QTest::newRow("Arial") << QString("Arial") << 1000 << QString("Some text");
|
|
}
|
|
|
|
void tst_QFontDatabase::widthTwoTimes()
|
|
{
|
|
QFETCH(QString, font);
|
|
QFETCH(int, pixelSize);
|
|
QFETCH(QString, text);
|
|
|
|
QFont f;
|
|
f.setFamily(font);
|
|
f.setPixelSize(pixelSize);
|
|
|
|
QFontMetrics fm(f);
|
|
int w1 = fm.charWidth(text, 0);
|
|
int w2 = fm.charWidth(text, 0);
|
|
|
|
QCOMPARE(w1, w2);
|
|
}
|
|
|
|
void tst_QFontDatabase::addAppFont_data()
|
|
{
|
|
QTest::addColumn<bool>("useMemoryFont");
|
|
QTest::newRow("font file") << false;
|
|
QTest::newRow("memory font") << true;
|
|
}
|
|
|
|
void tst_QFontDatabase::addAppFont()
|
|
{
|
|
QFETCH(bool, useMemoryFont);
|
|
QSignalSpy fontDbChangedSpy(QGuiApplication::instance(), SIGNAL(fontDatabaseChanged()));
|
|
|
|
QFontDatabase db;
|
|
|
|
const QStringList oldFamilies = db.families();
|
|
QVERIFY(!oldFamilies.isEmpty());
|
|
|
|
fontDbChangedSpy.clear();
|
|
|
|
int id;
|
|
if (useMemoryFont) {
|
|
QFile fontfile(m_ledFont);
|
|
fontfile.open(QIODevice::ReadOnly);
|
|
QByteArray fontdata = fontfile.readAll();
|
|
QVERIFY(!fontdata.isEmpty());
|
|
id = QFontDatabase::addApplicationFontFromData(fontdata);
|
|
} else {
|
|
id = QFontDatabase::addApplicationFont(m_ledFont);
|
|
}
|
|
#if defined(Q_OS_HPUX) && defined(QT_NO_FONTCONFIG)
|
|
// Documentation says that X11 systems that don't have fontconfig
|
|
// don't support application fonts.
|
|
QCOMPARE(id, -1);
|
|
return;
|
|
#endif
|
|
QCOMPARE(fontDbChangedSpy.count(), 1);
|
|
if (id == -1)
|
|
QSKIP("Skip the test since app fonts are not supported on this system");
|
|
|
|
const QStringList addedFamilies = QFontDatabase::applicationFontFamilies(id);
|
|
QVERIFY(!addedFamilies.isEmpty());
|
|
|
|
const QStringList newFamilies = db.families();
|
|
QVERIFY(!newFamilies.isEmpty());
|
|
QVERIFY(newFamilies.count() >= oldFamilies.count());
|
|
|
|
for (int i = 0; i < addedFamilies.count(); ++i) {
|
|
QString family = addedFamilies.at(i);
|
|
QVERIFY(newFamilies.contains(family));
|
|
QFont qfont(family);
|
|
QFontInfo fi(qfont);
|
|
QCOMPARE(fi.family(), family);
|
|
}
|
|
|
|
QVERIFY(QFontDatabase::removeApplicationFont(id));
|
|
QCOMPARE(fontDbChangedSpy.count(), 2);
|
|
|
|
QCOMPARE(db.families(), oldFamilies);
|
|
}
|
|
|
|
void tst_QFontDatabase::aliases()
|
|
{
|
|
QFontDatabase db;
|
|
const QStringList families = db.families();
|
|
QVERIFY(!families.isEmpty());
|
|
const QString firstFont = families.front();
|
|
QVERIFY(db.hasFamily(firstFont));
|
|
const QString alias = QStringLiteral("AliasToFirstFont") + firstFont;
|
|
QVERIFY(!db.hasFamily(alias));
|
|
QPlatformFontDatabase::registerAliasToFontFamily(firstFont, alias);
|
|
QVERIFY(db.hasFamily(alias));
|
|
}
|
|
|
|
void tst_QFontDatabase::fallbackFonts()
|
|
{
|
|
QTextLayout layout;
|
|
QString s;
|
|
s.append(QChar(0x31));
|
|
s.append(QChar(0x05D0));
|
|
layout.setText(s);
|
|
layout.beginLayout();
|
|
layout.createLine();
|
|
layout.endLayout();
|
|
|
|
QList<QGlyphRun> runs = layout.glyphRuns(0, 1);
|
|
foreach (QGlyphRun run, runs) {
|
|
QRawFont rawFont = run.rawFont();
|
|
QVERIFY(rawFont.isValid());
|
|
|
|
QCOMPARE(run.glyphIndexes().size(), 1);
|
|
QVERIFY(run.glyphIndexes().at(0) != 0);
|
|
}
|
|
}
|
|
|
|
static QString testString()
|
|
{
|
|
return QStringLiteral("foo bar");
|
|
}
|
|
|
|
void tst_QFontDatabase::condensedFontWidthNoFontMerging()
|
|
{
|
|
int regularFontId = QFontDatabase::addApplicationFont(m_testFont);
|
|
int condensedFontId = QFontDatabase::addApplicationFont(m_testFontCondensed);
|
|
|
|
QVERIFY(!QFontDatabase::applicationFontFamilies(regularFontId).isEmpty());
|
|
QVERIFY(!QFontDatabase::applicationFontFamilies(condensedFontId).isEmpty());
|
|
|
|
QString regularFontName = QFontDatabase::applicationFontFamilies(regularFontId).first();
|
|
QString condensedFontName = QFontDatabase::applicationFontFamilies(condensedFontId).first();
|
|
|
|
QFont condensedFont1(condensedFontName);
|
|
if (regularFontName == condensedFontName)
|
|
condensedFont1.setStyleName(QStringLiteral("Condensed"));
|
|
condensedFont1.setStyleStrategy(QFont::PreferMatch);
|
|
|
|
QFont condensedFont2 = condensedFont1;
|
|
condensedFont2.setStyleStrategy(QFont::StyleStrategy(QFont::NoFontMerging | QFont::PreferMatch));
|
|
|
|
QCOMPARE(QFontMetricsF(condensedFont2).horizontalAdvance(QStringLiteral("foobar")),
|
|
QFontMetricsF(condensedFont1).horizontalAdvance(QStringLiteral("foobar")));
|
|
}
|
|
|
|
void tst_QFontDatabase::condensedFontWidth()
|
|
{
|
|
QFontDatabase db;
|
|
QFontDatabase::addApplicationFont(m_testFont);
|
|
QFontDatabase::addApplicationFont(m_testFontCondensed);
|
|
|
|
QVERIFY(db.hasFamily("QtBidiTestFont"));
|
|
if (!db.hasFamily("QtBidiTestFontCondensed"))
|
|
QSKIP("This platform doesn't support font sub-family names (QTBUG-55625)");
|
|
|
|
// Test we really get a condensed font, and a not renormalized one (QTBUG-48043):
|
|
QFont testFont("QtBidiTestFont");
|
|
QFont testFontCondensed("QtBidiTestFontCondensed");
|
|
QFontMetrics fmTF(testFont);
|
|
QFontMetrics fmTFC(testFontCondensed);
|
|
QVERIFY(fmTF.horizontalAdvance(testString()) > fmTFC.horizontalAdvance(testString()));
|
|
|
|
}
|
|
|
|
void tst_QFontDatabase::condensedFontMatching()
|
|
{
|
|
QFontDatabase db;
|
|
QFontDatabase::removeAllApplicationFonts();
|
|
QFontDatabase::addApplicationFont(m_testFontCondensed);
|
|
if (!db.hasFamily("QtBidiTestFont"))
|
|
QSKIP("This platform doesn't support preferred font family names (QTBUG-53478)");
|
|
QFontDatabase::addApplicationFont(m_testFont);
|
|
|
|
// Test we correctly get the condensed font using different font matching methods:
|
|
QFont tfcByStretch("QtBidiTestFont");
|
|
tfcByStretch.setStretch(QFont::Condensed);
|
|
QFont tfcByStyleName("QtBidiTestFont");
|
|
tfcByStyleName.setStyleName("Condensed");
|
|
|
|
#ifdef Q_OS_WIN
|
|
QEXPECT_FAIL("","No matching of sub-family by stretch on Windows", Continue);
|
|
#endif
|
|
|
|
QCOMPARE(QFontMetrics(tfcByStretch).horizontalAdvance(testString()),
|
|
QFontMetrics(tfcByStyleName).horizontalAdvance(testString()));
|
|
|
|
if (!db.hasFamily("QtBidiTestFontCondensed"))
|
|
QSKIP("This platform doesn't support font sub-family names (QTBUG-55625)");
|
|
|
|
QFont tfcBySubfamilyName("QtBidiTestFontCondensed");
|
|
QCOMPARE(QFontMetrics(tfcByStyleName).horizontalAdvance(testString()),
|
|
QFontMetrics(tfcBySubfamilyName).horizontalAdvance(testString()));
|
|
}
|
|
|
|
void tst_QFontDatabase::rasterFonts()
|
|
{
|
|
QFont font(QLatin1String("Fixedsys"), 1000);
|
|
QFontInfo fontInfo(font);
|
|
|
|
if (fontInfo.family() != font.family())
|
|
QSKIP("Fixedsys font not available.");
|
|
|
|
QVERIFY(!QFontDatabase().isSmoothlyScalable(font.family()));
|
|
QVERIFY(fontInfo.pointSize() != font.pointSize());
|
|
}
|
|
|
|
void tst_QFontDatabase::smoothFonts()
|
|
{
|
|
QFont font(QLatin1String("Arial"), 1000);
|
|
QFontInfo fontInfo(font);
|
|
|
|
if (fontInfo.family() != font.family())
|
|
QSKIP("Arial font not available.");
|
|
|
|
// Smooth and bitmap scaling are mutually exclusive
|
|
QVERIFY(QFontDatabase().isSmoothlyScalable(font.family()));
|
|
QVERIFY(!QFontDatabase().isBitmapScalable(font.family()));
|
|
}
|
|
|
|
QTEST_MAIN(tst_QFontDatabase)
|
|
#include "tst_qfontdatabase.moc"
|