[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/keyboard
From:       Björn Ruberg <bjoern () ruberg-wegener ! de>
Date:       2010-10-16 15:14:42
Message-ID: 20101016151442.9BD4AAC896 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1186471 by ruberg:

Use the theme TextColor and DesktopFont for drawing 



 M  +4 -2      keyboard_applet.cpp  


--- trunk/KDE/kdebase/workspace/kcontrol/keyboard/keyboard_applet.cpp #1186470:1186471
@@ -19,6 +19,7 @@
 #include "keyboard_applet.h"
 
 #include <kglobalsettings.h>
+#include <plasma/theme.h>
 #include <plasma/tooltipmanager.h>
 #include <ktoolinvocation.h>
 
@@ -139,6 +140,7 @@
 {
 	p->setRenderHint(QPainter::SmoothPixmapTransform);
 	p->setRenderHint(QPainter::Antialiasing);
+	//p->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor));
 
 	LayoutUnit layoutUnit = X11Helper::getCurrentLayout();
 	if( layoutUnit.isEmpty() )
@@ -154,8 +156,8 @@
 		kDebug() << "applet: LayoutChanged" << layoutUnit.toString() << shortText;
 
 		p->save();
-//		p->setPen(Qt::black);
-		QFont font = p->font();
+		p->setPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor));
+		QFont font = Plasma::Theme::defaultTheme()->font(Plasma::Theme::DesktopFont);
 		int height = contentsRect.height();
 		int fontSize = shortText.length() == 2
 				? height * 7 / 10
[prev in list] [next in list] [prev in thread] [next in thread]