Patch from Frerich to use KGlobalSetting instead of hardcoding helvetica.
Looks like he's too shy to commit it himself ;). svn path=/trunk/kdebase/kwin/; revision=258819
This commit is contained in:
parent
11ce009264
commit
fa2f71549f
1 changed files with 3 additions and 2 deletions
|
@ -25,6 +25,7 @@ DEALINGS IN THE SOFTWARE.
|
||||||
#include "kdecoration_p.h"
|
#include "kdecoration_p.h"
|
||||||
|
|
||||||
#include <kconfig.h>
|
#include <kconfig.h>
|
||||||
|
#include <kglobalsettings.h>
|
||||||
#include <qpalette.h>
|
#include <qpalette.h>
|
||||||
#include <qapplication.h>
|
#include <qapplication.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
@ -141,8 +142,8 @@ unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config )
|
||||||
QFont old_activeFontSmall = activeFontSmall;
|
QFont old_activeFontSmall = activeFontSmall;
|
||||||
QFont old_inactiveFontSmall = inactiveFontSmall;
|
QFont old_inactiveFontSmall = inactiveFontSmall;
|
||||||
|
|
||||||
// Keep in sync with kglobalsettings.
|
QFont activeFontGuess = KGlobalSettings::generalFont();
|
||||||
QFont activeFontGuess("helvetica", 12, QFont::Bold);
|
activeFontGuess.setBold(true);
|
||||||
activeFontGuess.setPixelSize(12);
|
activeFontGuess.setPixelSize(12);
|
||||||
|
|
||||||
activeFont = config->readFontEntry("activeFont", &activeFontGuess);
|
activeFont = config->readFontEntry("activeFont", &activeFontGuess);
|
||||||
|
|
Loading…
Reference in a new issue