Merging from old trunk:

r608824 | lunakl | 2006-11-28 15:42:48 +0100 (Tue, 28 Nov 2006) | 4 lines

Match defaults.
(BUG: 137889)


svn path=/trunk/KDE/kdebase/workspace/; revision=659468
This commit is contained in:
Luboš Luňák 2007-04-30 09:40:14 +00:00
parent 176f0e39ce
commit 9528129717

View file

@ -144,9 +144,7 @@ unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config )
QFont old_activeFontSmall = activeFontSmall;
QFont old_inactiveFontSmall = inactiveFontSmall;
QFont activeFontGuess = KGlobalSettings::generalFont();
activeFontGuess.setBold(true);
activeFontGuess.setPixelSize(12);
QFont activeFontGuess = KGlobalSettings::windowTitleFont();
activeFont = wmConfig.readEntry("activeFont", activeFontGuess);
inactiveFont = wmConfig.readEntry("inactiveFont", activeFont);