Use custom named fonts.

fonts/fonts.qrc

@@ -1,7 +1,10 @@
 <RCC>
   <qresource prefix="/gui/fonts">
-    <file>OpenSans-Regular.ttf</file>
+    <file>DAOpenSansRegular.ttf</file>
-    <file>OpenSans-Bold.ttf</file>
+    <file>DAOpenSansRegularItalic.ttf</file>
-    <file>OpenSans-Semibold.ttf</file>
+    <file>DAOpenSansBold.ttf</file>
+    <file>DAOpenSansBoldItalic.ttf</file>
+    <file>DAOpenSansSemibold.ttf</file>
+    <file>DAOpenSansSemiboldItalic.ttf</file>
   </qresource>
 </RCC>

ui/style/style_core_font.cpp

@@ -66,15 +66,16 @@ bool LoadCustomFont(const QString &filePath, const QString &familyName, int flag
 		return false;
 	}
 
-	auto found = [&familyName, regularId] {
+	const auto found = [&] {
 		for (auto &family : QFontDatabase::applicationFontFamilies(regularId)) {
+			UI_LOG(("Font: from '%1' loaded '%2'").arg(filePath).arg(family));
 			if (!family.trimmed().compare(familyName, Qt::CaseInsensitive)) {
 				return true;
 			}
 		}
 		return false;
-	};
+	}();
-	if (!found()) {
+	if (!found) {
 		UI_LOG(("Font Error: could not locate '%1' font in '%2'.").arg(familyName).arg(filePath));
 		return false;
 	}
@@ -82,9 +83,43 @@ bool LoadCustomFont(const QString &filePath, const QString &familyName, int flag
 	return ValidateFont(familyName, flags);
 }
 
+enum {
+	FontTypeRegular = 0,
+	FontTypeRegularItalic,
+	FontTypeBold,
+	FontTypeBoldItalic,
+	FontTypeSemibold,
+	FontTypeSemiboldItalic,
+
+	FontTypesCount,
+};
+QString FontTypeNames[FontTypesCount] = {
+	"DAOpenSansRegular",
+	"DAOpenSansRegularItalic",
+	"DAOpenSansBold",
+	"DAOpenSansBoldItalic",
+	"DAOpenSansSemibold",
+	"DAOpenSansSemiboldItalic",
+};
+int32 FontTypeFlags[FontTypesCount] = {
+	0,
+	FontItalic,
+	FontBold,
+	FontBold | FontItalic,
+	0,
+	FontItalic,
+};
+QString FontTypeWindowsFallback[FontTypesCount] = {
+	"Segoe UI",
+	"Segoe UI",
+	"Segoe UI",
+	"Segoe UI",
+	"Segoe UI Semibold",
+	"Segoe UI Semibold",
+};
+
 bool Started = false;
-QString OpenSansOverride;
+QString Overrides[FontTypesCount];
-QString OpenSansSemiboldOverride;
 
 } // namespace
 
@@ -96,49 +131,66 @@ void StartFonts() {
 
 	style_InitFontsResource();
 
-	auto regular = LoadCustomFont(":/gui/fonts/OpenSans-Regular.ttf", "Open Sans");
+	bool areGood[FontTypesCount] = { false };
-	auto bold = LoadCustomFont(":/gui/fonts/OpenSans-Bold.ttf", "Open Sans", style::internal::FontBold);
+	for (auto i = 0; i != FontTypesCount; ++i) {
-	auto semibold = LoadCustomFont(":/gui/fonts/OpenSans-Semibold.ttf", "Open Sans Semibold");
+		const auto name = FontTypeNames[i];
-
+		const auto flags = FontTypeFlags[i];
+		areGood[i] = LoadCustomFont(":/gui/fonts/" + name + ".ttf", name, flags);
+		Overrides[i] = name;
 #ifdef Q_OS_WIN
 		// Attempt to workaround a strange font bug with Open Sans Semibold not loading.
 		// See https://github.com/telegramdesktop/tdesktop/issues/3276 for details.
 		// Crash happens on "options.maxh / _t->_st->font->height" with "division by zero".
 		// In that place "_t->_st->font" is "semiboldFont" is "font(13 "Open Sans Semibold").
-	if (!regular || !bold) {
+		const auto fallback = FontTypeWindowsFallback[i];
-		if (ValidateFont("Segoe UI") && ValidateFont("Segoe UI", style::internal::FontBold)) {
+		if (!areGood[i]) {
-			OpenSansOverride = "Segoe UI";
+			if (ValidateFont(fallback, flags)) {
-			UI_LOG(("Fonts Info: Using Segoe UI instead of Open Sans."));
+				Overrides[i] = fallback;
-		}
+				UI_LOG(("Fonts Info: Using '%1' instead of '%2'.").arg(fallback).arg(name));
-	}
-	if (!semibold) {
-		if (ValidateFont("Segoe UI Semibold")) {
-			OpenSansSemiboldOverride = "Segoe UI Semibold";
-			UI_LOG(("Fonts Info: Using Segoe UI Semibold instead of Open Sans Semibold."));
 			}
 		}
 		// Disable default fallbacks to Segoe UI, see:
 		// https://github.com/telegramdesktop/tdesktop/issues/5368
 		//
-	//QFont::insertSubstitution("Open Sans", "Segoe UI");
+		//QFont::insertSubstitution(name, fallback);
-	//QFont::insertSubstitution("Open Sans Semibold", "Segoe UI Semibold");
+#endif // Q_OS_WIN
-#elif defined Q_OS_MAC // Q_OS_WIN
+	}
+#ifdef Q_OS_MAC
 	auto list = QStringList();
 	list.append(".SF NS Text");
 	list.append("Helvetica Neue");
 	list.append("Lucida Grande");
-	QFont::insertSubstitutions("Open Sans", list);
+	for (const auto &name : FontTypeNames) {
-	QFont::insertSubstitutions("Open Sans Semibold", list);
+		QFont::insertSubstitutions(name, list);
-#endif // Q_OS_WIN || Q_OS_MAC
+	}
+#endif // Q_OS_MAC
 }
 
-QString GetFontOverride(const QString &familyName) {
+QString GetPossibleEmptyOverride(const QString &familyName, int32 flags) {
+	flags = flags & (FontBold | FontItalic);
 	if (familyName == qstr("Open Sans")) {
-		return OpenSansOverride.isEmpty() ? familyName : OpenSansOverride;
+		if (flags == (FontBold | FontItalic)) {
-	} else if (familyName == qstr("Open Sans Semibold")) {
+			return Overrides[FontTypeBoldItalic];
-		return OpenSansSemiboldOverride.isEmpty() ? familyName : OpenSansSemiboldOverride;
+		} else if (flags == FontBold) {
+			return Overrides[FontTypeBold];
+		} else if (flags == FontItalic) {
+			return Overrides[FontTypeRegularItalic];
+		} else if (flags == 0) {
+			return Overrides[FontTypeRegular];
 		}
-	return familyName;
+	} else if (familyName == qstr("Open Sans Semibold")) {
+		if (flags == FontItalic) {
+			return Overrides[FontTypeSemiboldItalic];
+		} else if (flags == 0) {
+			return Overrides[FontTypeSemibold];
+		}
+	}
+	return QString();
+}
+
+QString GetFontOverride(const QString &familyName, int32 flags) {
+	const auto result = GetPossibleEmptyOverride(familyName, flags);
+	return result.isEmpty() ? familyName : result;
 }
 
 void destroyFonts() {
@@ -159,7 +211,7 @@ int registerFontFamily(const QString &family) {
 }
 
 FontData::FontData(int size, uint32 flags, int family, Font *other)
-: f(GetFontOverride(fontFamilies[family]))
+: f(GetFontOverride(fontFamilies[family], flags))
 , m(f)
 , _size(size)
 , _flags(flags)

ui/style/style_core_font.h

@@ -15,7 +15,7 @@ namespace style {
 namespace internal {
 
 void StartFonts();
-[[nodiscard]] QString GetFontOverride(const QString &familyName);
+[[nodiscard]] QString GetFontOverride(const QString &familyName, int32 flags = 0);
 
 void destroyFonts();
 int registerFontFamily(const QString &family);