[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=78c51ca

The following commit has been merged in the master branch:
commit 78c51cab73926753ce8a1bfcf313bd0cd566e486
Author: Nikita Skovoroda <chalkerx at gmail.com>
Date:   Wed Apr 11 12:12:45 2012 +0100

    Do not use "smallest font"+1 in delegates  Instead just use "General Font" .
---
 contact-delegate-compact.cpp | 3 +--
 contact-delegate.cpp         | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index 829d713..1a82cfa 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -94,8 +94,7 @@ void ContactDelegateCompact::paintContact(QPainter * painter, const QStyleOption
 
     painter->drawPixmap(statusIconRect, icon);
 
-    QFont nameFont = KGlobalSettings::smallestReadableFont();
-    nameFont.setPointSize(nameFont.pointSize() + 1);
+    QFont nameFont = KGlobalSettings::generalFont();
 
     const QFontMetrics nameFontMetrics(nameFont);
 
diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index ac4c0c9..14024f6 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -113,8 +113,7 @@ void ContactDelegate::paintContact(QPainter * painter, const QStyleOptionViewIte
     userNameRect.setY(userNameRect.y() + 2);
     userNameRect.setWidth(userNameRect.width() - PRESENCE_ICON_SIZE - SPACING);
 
-    QFont nameFont = KGlobalSettings::smallestReadableFont();
-    nameFont.setPointSize(nameFont.pointSize() + 1);
+    QFont nameFont = KGlobalSettings::generalFont();
     nameFont.setWeight(QFont::Bold);
 
     const QFontMetrics nameFontMetrics(nameFont);

-- 
ktp-contact-list packaging