Utils: Introduce H5, H6 and "H6 Capital" Ui fonts

As defined by the new Qt Creator design system.

Change-Id: Ib67b35ea552cf88c4b89481b72e690e04a57bbb7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Alessandro Portale
2023-12-11 11:59:45 +01:00
parent 2becddf704
commit fb28890eb2
2 changed files with 19 additions and 0 deletions

View File

@@ -967,6 +967,17 @@ QFont StyleHelper::uiFont(UiElement element)
font.setPointSizeF(font.pointSizeF() * 1.2); font.setPointSizeF(font.pointSizeF() * 1.2);
font.setBold(true); font.setBold(true);
break; break;
case UiElementH5:
font.setPointSizeF(font.pointSizeF() * 1.2);
font.setWeight(QFont::DemiBold);
break;
case UiElementH6:
font.setWeight(QFont::DemiBold);
break;
case UiElementH6Capital:
font.setWeight(QFont::DemiBold);
font.setCapitalization(QFont::AllUppercase);
break;
case UiElementCaptionStrong: case UiElementCaptionStrong:
font.setPointSizeF(panelTitleSize); font.setPointSizeF(panelTitleSize);
font.setWeight(QFont::DemiBold); font.setWeight(QFont::DemiBold);
@@ -989,10 +1000,15 @@ QString StyleHelper::fontToCssProperties(const QFont &font)
const QString fontShorthand = fontStyle + " " + QString::number(font.weight()) + " " const QString fontShorthand = fontStyle + " " + QString::number(font.weight()) + " "
+ fontSize + " " + font.family(); + fontSize + " " + font.family();
const QString textDecoration = QLatin1String(font.underline() ? "underline" : "none"); const QString textDecoration = QLatin1String(font.underline() ? "underline" : "none");
const QString textTransform = QLatin1String(font.capitalization() == QFont::AllUppercase
? "uppercase"
: font.capitalization() == QFont::AllLowercase
? "lowercase" : "none");
const QString propertyTemplate = "%1: %2"; const QString propertyTemplate = "%1: %2";
const QStringList cssProperties = { const QStringList cssProperties = {
propertyTemplate.arg("font").arg(fontShorthand), propertyTemplate.arg("font").arg(fontShorthand),
propertyTemplate.arg("text-decoration").arg(textDecoration), propertyTemplate.arg("text-decoration").arg(textDecoration),
propertyTemplate.arg("text-transform").arg(textTransform),
propertyTemplate.arg("word-spacing").arg(font.wordSpacing()), propertyTemplate.arg("word-spacing").arg(font.wordSpacing()),
}; };
const QString fontCssStyle = cssProperties.join("; "); const QString fontCssStyle = cssProperties.join("; ");

View File

@@ -52,6 +52,9 @@ enum UiElement {
UiElementH2, UiElementH2,
UiElementH3, UiElementH3,
UiElementH4, UiElementH4,
UiElementH5,
UiElementH6,
UiElementH6Capital,
UiElementCaptionStrong, UiElementCaptionStrong,
UiElementCaption, UiElementCaption,
}; };