diff --git a/src/platformtheme/kfontsettingsdata.h b/src/platformtheme/kfontsettingsdata.h --- a/src/platformtheme/kfontsettingsdata.h +++ b/src/platformtheme/kfontsettingsdata.h @@ -32,6 +32,7 @@ int Size; int Weight; QFont::StyleHint StyleHint; + const char *StyleName; }; class KFontSettingsData : public QObject diff --git a/src/platformtheme/kfontsettingsdata.cpp b/src/platformtheme/kfontsettingsdata.cpp --- a/src/platformtheme/kfontsettingsdata.cpp +++ b/src/platformtheme/kfontsettingsdata.cpp @@ -53,13 +53,13 @@ static const char DefaultFont[] = "Noto Sans"; static const KFontData DefaultFontData[KFontSettingsData::FontTypesCount] = { - { GeneralId, "font", DefaultFont, 10, -1, QFont::SansSerif }, - { GeneralId, "fixed", "Hack", 9, -1, QFont::Monospace }, - { GeneralId, "toolBarFont", DefaultFont, 9, -1, QFont::SansSerif }, - { GeneralId, "menuFont", DefaultFont, 10, -1, QFont::SansSerif }, - { "WM", "activeFont", DefaultFont, 10, -1, QFont::SansSerif }, - { GeneralId, "taskbarFont", DefaultFont, 10, -1, QFont::SansSerif }, - { GeneralId, "smallestReadableFont", DefaultFont, 8, -1, QFont::SansSerif } + { GeneralId, "font", DefaultFont, 10, -1, QFont::SansSerif, "Regular" }, + { GeneralId, "fixed", "Hack", 9, -1, QFont::Monospace, "Regular" }, + { GeneralId, "toolBarFont", DefaultFont, 9, -1, QFont::SansSerif, "Regular" }, + { GeneralId, "menuFont", DefaultFont, 10, -1, QFont::SansSerif, "Regular" }, + { "WM", "activeFont", DefaultFont, 10, -1, QFont::SansSerif, "Regular" }, + { GeneralId, "taskbarFont", DefaultFont, 10, -1, QFont::SansSerif, "Regular" }, + { GeneralId, "smallestReadableFont", DefaultFont, 8, -1, QFont::SansSerif, "Regular" } }; QFont *KFontSettingsData::font(FontTypes fontType) @@ -70,6 +70,7 @@ const KFontData &fontData = DefaultFontData[fontType]; cachedFont = new QFont(QLatin1String(fontData.FontName), fontData.Size, fontData.Weight); cachedFont->setStyleHint(fontData.StyleHint); + cachedFont->setStyleName(QLatin1String(fontData.StyleName)); const KConfigGroup configGroup(mKdeGlobals, fontData.ConfigGroupKey); QString fontInfo = configGroup.readEntry(fontData.ConfigKey, QString());