Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

request only scalable outlines from QFontDatabase

Browse source 
to reduce the iterations and so that fontconfig can pickup fonts for such
such cases based on the configuration

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-03-31 06:23:17 +03:00
parent d16c5c6164
commit b18f9e246e
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gui/text/qfontdatabase.cpp
View file

@ -189,6 +189,9 @@ static FcPattern* patternForFont(const QString &family, const QString &style, co
return nullptr;
}
FcPatternAddBool(pattern, FC_OUTLINE, true);
FcPatternAddBool(pattern, FC_SCALABLE, true);
QString parsedfamily, parsedfoundry;
QFontDatabasePrivate::parseFontName(family, parsedfoundry, parsedfamily);
@ -405,9 +408,6 @@ static FcPattern* patternForRequest(const QFontDef &request)
FcPatternAddInteger(pattern, FC_SPACING, pitch_value);
}
FcPatternAddBool(pattern, FC_OUTLINE, true);
FcPatternAddBool(pattern, FC_SCALABLE, true);
const double size_value = qMax(qreal(1.), request.pixelSize);
FcPatternAddDouble(pattern, FC_PIXEL_SIZE, size_value);
@ -662,12 +662,14 @@ QStringList QFontDatabase::families() const
return result;
}
FcPatternAddBool(pattern, FC_OUTLINE, true);
FcPatternAddBool(pattern, FC_SCALABLE, true);
FcObjectSet* os = FcObjectSetCreate();
if (Q_UNLIKELY(!os)) {
FcPatternDestroy(pattern);
return result;
}
FcObjectSetAdd(os, FC_SCALABLE);
FcObjectSetAdd(os, FC_FAMILY);
FcObjectSetAdd(os, FC_FOUNDRY);
FcFontSet* fonts = FcFontList(NULL, pattern, os);
@ -680,12 +682,7 @@ QStringList QFontDatabase::families() const
for (int i = 0; i < fonts->nfont; i++) {
FcChar8* family_value = nullptr;
FcChar8* foundry_value = nullptr;
FcBool scalable_value = FcFalse;
FcPatternGetBool(fonts->fonts[i], FC_SCALABLE, 0, &scalable_value);
if (scalable_value != FcTrue) {
continue;
}
if (FcPatternGetString(fonts->fonts[i], FC_FAMILY, 0, &family_value) != FcResultMatch) {
continue;
}
@ -746,7 +743,6 @@ QStringList QFontDatabase::styles(const QString &family) const
if (Q_UNLIKELY(!os)) {
return result;
}
FcObjectSetAdd(os, FC_SCALABLE);
FcObjectSetAdd(os, FC_FAMILY);
FcObjectSetAdd(os, FC_STYLE);
pattern = FcPatternCreate();
@ -754,6 +750,9 @@ QStringList QFontDatabase::styles(const QString &family) const
return result;
}
FcPatternAddBool(pattern, FC_OUTLINE, true);
FcPatternAddBool(pattern, FC_SCALABLE, true);
// the only way to get all font family styles is to query all fonts
FcFontSet *fonts = FcFontList(NULL, pattern, os);
FcPatternDestroy(pattern);
@ -763,12 +762,7 @@ QStringList QFontDatabase::styles(const QString &family) const
}
for (int i = 0; i < fonts->nfont; i++) {
FcChar8* style_value = nullptr;
FcBool scalable_value = FcFalse;
FcPatternGetBool(fonts->fonts[i], FC_SCALABLE, 0, &scalable_value);
if (scalable_value != FcTrue) {
continue;
}
if (FcPatternGetString(fonts->fonts[i], FC_FAMILY, 0, &family_value) != FcResultMatch) {
continue;
}