whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Respect font stretch if set together with font style 

Fixes: QTBUG-77854
Change-Id: I2bf9cea9d5ecd151a9d96bbe93e9477a9159ca1f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
bb10
Albert Astals Cid 2021-09-28 17:00:59 +02:00
parent c89c145616
commit ae10084ef9
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/text/qfontdatabase.cpp
View File

@ -783,7 +783,7 @@ QFontEngine *loadSingleEngine(int script,
if (style->key.stretch != 0 && request.stretch != 0
&& (request.styleName.isEmpty() || request.styleName != style->styleName)) {
def.stretch = (request.stretch * 100 + style->key.stretch / 2) / style->key.stretch;
} else {
} else if (request.stretch == QFont::AnyStretch) {
def.stretch = 100;
}

24
tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
View File

@ -80,6 +80,8 @@ private slots:
void registerOpenTypePreferredNamesSystem();
void registerOpenTypePreferredNamesApplication();
void stretchRespected();
private:
QString m_ledFont;
QString m_testFont;
@ -349,6 +351,28 @@ static QString testString()
return QStringLiteral("foo bar");
}
void tst_QFontDatabase::stretchRespected()
{
int italicId = QFontDatabase::addApplicationFont(m_testFontItalic);
QVERIFY(italicId != -1);
QVERIFY(!QFontDatabase::applicationFontFamilies(italicId).isEmpty());
QString italicFontName = QFontDatabase::applicationFontFamilies(italicId).first();
QFont italicFont = QFontDatabase::font(italicFontName,
QString::fromLatin1("Italic"), 14);
QVERIFY(italicFont.italic());
QFont italicStretchedFont = italicFont;
italicStretchedFont.setStretch( 400 );
QVERIFY(QFontMetricsF(italicFont).horizontalAdvance(QStringLiteral("foobar")) <
QFontMetricsF(italicStretchedFont).horizontalAdvance(QStringLiteral("foobar")));
QFontDatabase::removeApplicationFont(italicId);
}
void tst_QFontDatabase::condensedFontWidthNoFontMerging()
{
int regularFontId = QFontDatabase::addApplicationFont(m_testFont);