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

kdeui: reduce the size of default fonts table data

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-04-16 20:47:17 +03:00
parent d730fd5e9a
commit db9e41bf06
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
kdeui/kernel/kglobalsettings.cpp
View file

@ -333,7 +333,6 @@ struct KFontData
const char* ConfigKey;
const char* FontName;
int Size;
int Weight;
#if QT_VERSION < 0x041200
QFont::StyleHint StyleHint;
#endif
@ -345,21 +344,21 @@ static const char GeneralId[] = "General";
static const KFontData DefaultFontData[KGlobalSettingsData::FontTypesCount] =
{
#if QT_VERSION < 0x041200
{ GeneralId, "font", KDE_DEFAULT_FONT, 9, -1, QFont::SansSerif },
{ GeneralId, "fixed", KDE_DEFAULT_FIXED_FONT, 9, -1, QFont::TypeWriter },
{ GeneralId, "toolBarFont", KDE_DEFAULT_FONT, 8, -1, QFont::SansSerif },
{ GeneralId, "menuFont", KDE_DEFAULT_FONT, 9, -1, QFont::SansSerif },
{ "WM", "activeFont", KDE_DEFAULT_FONT, 8, -1, QFont::SansSerif },
{ GeneralId, "taskbarFont", KDE_DEFAULT_FONT, 9, -1, QFont::SansSerif },
{ GeneralId, "smallestReadableFont", KDE_DEFAULT_FONT, 8, -1, QFont::SansSerif }
{ GeneralId, "font", KDE_DEFAULT_FONT, 9, QFont::SansSerif },
{ GeneralId, "fixed", KDE_DEFAULT_FIXED_FONT, 9, QFont::TypeWriter },
{ GeneralId, "toolBarFont", KDE_DEFAULT_FONT, 8, QFont::SansSerif },
{ GeneralId, "menuFont", KDE_DEFAULT_FONT, 9, QFont::SansSerif },
{ "WM", "activeFont", KDE_DEFAULT_FONT, 8, QFont::SansSerif },
{ GeneralId, "taskbarFont", KDE_DEFAULT_FONT, 9, QFont::SansSerif },
{ GeneralId, "smallestReadableFont", KDE_DEFAULT_FONT, 8, QFont::SansSerif }
#else
{ GeneralId, "font", KDE_DEFAULT_FONT, 9, -1 },
{ GeneralId, "fixed", KDE_DEFAULT_FIXED_FONT, 9, -1 },
{ GeneralId, "toolBarFont", KDE_DEFAULT_FONT, 8, -1 },
{ GeneralId, "menuFont", KDE_DEFAULT_FONT, 9, -1 },
{ "WM", "activeFont", KDE_DEFAULT_FONT, 8, -1 },
{ GeneralId, "taskbarFont", KDE_DEFAULT_FONT, 9, -1 },
{ GeneralId, "smallestReadableFont", KDE_DEFAULT_FONT, 8, -1 }
{ GeneralId, "font", KDE_DEFAULT_FONT, 9 },
{ GeneralId, "fixed", KDE_DEFAULT_FIXED_FONT, 9 },
{ GeneralId, "toolBarFont", KDE_DEFAULT_FONT, 8 },
{ GeneralId, "menuFont", KDE_DEFAULT_FONT, 9 },
{ "WM", "activeFont", KDE_DEFAULT_FONT, 8 },
{ GeneralId, "taskbarFont", KDE_DEFAULT_FONT, 9 },
{ GeneralId, "smallestReadableFont", KDE_DEFAULT_FONT, 8 }
#endif
};
@ -370,7 +369,7 @@ QFont KGlobalSettingsData::font( FontTypes fontType )
if (!cachedFont)
{
const KFontData& fontData = DefaultFontData[fontType];
cachedFont = new QFont( fontData.FontName, fontData.Size, fontData.Weight );
cachedFont = new QFont( fontData.FontName, fontData.Size );
#if QT_VERSION < 0x041200
cachedFont->setStyleHint( fontData.StyleHint );
#endif