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

Extend generated style strings to include new font weights 

When a font style-name is not directly available from the font we
need to generate it with the data we have, so we should include all
the new supported weights.

Change-Id: I45cc0114f8c76f45bc7a639f9d0d8096a064bc51
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: René J.V. Bertin <rjvbertin@gmail.com>
Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
bb10
Allan Sandfeld Jensen 2015-05-13 11:24:07 +02:00
parent 7c8b3699bf
commit 46e8ac0308
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1184,14 +1184,25 @@ static int match(int script, const QFontDef &request,
static QString styleStringHelper(int weight, QFont::Style style)
{
QString result;
if (weight >= QFont::Black)
result = QCoreApplication::translate("QFontDatabase", "Black");
else if (weight >= QFont::Bold)
result = QCoreApplication::translate("QFontDatabase", "Bold");
else if (weight >= QFont::DemiBold)
result = QCoreApplication::translate("QFontDatabase", "Demi Bold");
else if (weight < QFont::Normal)
result = QCoreApplication::translate("QFontDatabase", "Light");
if (weight > QFont::Normal) {
if (weight >= QFont::Black)
result = QCoreApplication::translate("QFontDatabase", "Black");
else if (weight >= QFont::ExtraBold)
result = QCoreApplication::translate("QFontDatabase", "Extra Bold");
else if (weight >= QFont::Bold)
result = QCoreApplication::translate("QFontDatabase", "Bold");
else if (weight >= QFont::DemiBold)
result = QCoreApplication::translate("QFontDatabase", "Demi Bold");
else if (weight >= QFont::Medium)
result = QCoreApplication::translate("QFontDatabase", "Medium", "The Medium font weight");
} else {
if (weight <= QFont::Thin)
result = QCoreApplication::translate("QFontDatabase", "Thin");
else if (weight <= QFont::ExtraLight)
result = QCoreApplication::translate("QFontDatabase", "Extra Light");
else if (weight <= QFont::Light)
result = QCoreApplication::translate("QFontDatabase", "Light");
}
if (style == QFont::StyleItalic)
result += QLatin1Char(' ') + QCoreApplication::translate("QFontDatabase", "Italic");
@ -1199,7 +1210,7 @@ static QString styleStringHelper(int weight, QFont::Style style)
result += QLatin1Char(' ') + QCoreApplication::translate("QFontDatabase", "Oblique");
if (result.isEmpty())
result = QCoreApplication::translate("QFontDatabase", "Normal");
result = QCoreApplication::translate("QFontDatabase", "Normal", "The Normal or Regular font weight");
return result.simplified();
}