yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pick fonts in the same way as kglobalsettings - this should fix letters

Browse source 
being chopped at the bottom

svn path=/trunk/kdebase/kwin/; revision=64838
This commit is contained in:
Rik Hemsley 2000-09-23 19:58:45 +00:00
parent aa3eb43071
commit 6c767761ae
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
options.cpp
View file

@ -9,6 +9,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
#include <kapp.h> #include <kapp.h>
#include <kconfig.h> #include <kconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <kglobalsettings.h>
Options::Options() Options::Options()
: QObject( 0, 0) : QObject( 0, 0)
@ -118,11 +119,16 @@ void Options::reload()
colors[Font+KWINCOLORS] = config->readColorEntry("inactiveForeground", colors[Font+KWINCOLORS] = config->readColorEntry("inactiveForeground",
&colors[Font+KWINCOLORS]); &colors[Font+KWINCOLORS]);
activeFont = QFont("Helvetica", 12, QFont::Bold); // Keep in sync with kglobalsettings.
activeFont = config->readFontEntry("activeFont", &activeFont);
inactiveFont = config->readFontEntry("inactiveFont", &activeFont);
activeFontSmall = QFont("Helvetica", 10, QFont::Bold); QFont activeFontGuess("helvetica", 12, QFont::SansSerif, true);
activeFontGuess.setPixelSize(12);
activeFont = config->readFontEntry("activeFont", &activeFontGuess);
inactiveFont = config->readFontEntry("inactiveFont", &activeFontGuess);
activeFontSmall = activeFont;
activeFontSmall.setPointSize(activeFont.pointSize() - 2);
activeFontSmall = config->readFontEntry("activeFontSmall", &activeFontSmall); activeFontSmall = config->readFontEntry("activeFontSmall", &activeFontSmall);
inactiveFontSmall = config->readFontEntry("inactiveFontSmall", &activeFontSmall); inactiveFontSmall = config->readFontEntry("inactiveFontSmall", &activeFontSmall);