Ooops. Didn't mean to sneak this in.
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=771018
This commit is contained in:
parent
576a655b05
commit
886eb24647
@ -36,7 +36,6 @@
|
||||
#include <QDesktopWidget>
|
||||
|
||||
#include <KDebug>
|
||||
#include <KGlobalSettings>
|
||||
|
||||
#include "layouts/freelayout.h"
|
||||
#include "plasma/plasma.h"
|
||||
@ -313,13 +312,7 @@ QSizeF Widget::size() const
|
||||
|
||||
QFont Widget::font() const
|
||||
{
|
||||
if (managingLayout()) {
|
||||
kDebug() << "layout, return taskbarFont()";
|
||||
return KGlobalSettings::taskbarFont();
|
||||
} else {
|
||||
kDebug() << "nolayout, return desktopFont()";
|
||||
return KGlobalSettings::desktopFont();
|
||||
}
|
||||
return QApplication::font();
|
||||
}
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user