[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=242e983

The following commit has been merged in the master branch:
commit 242e983a2e82c3543fda631426871f8df52fb187
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Sat May 12 17:07:01 2012 +0200

    Don't use bold font on contact names and use grey color on presence message
    
    Reviewed-by: David Edmundson
---
 contact-delegate.cpp | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index 9a8d69a..2b8a863 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -113,32 +113,28 @@ void ContactDelegate::paintContact(QPainter *painter, const QStyleOptionViewItem
     userNameRect.setY(userNameRect.y() + 2);
     userNameRect.setWidth(userNameRect.width() - PRESENCE_ICON_SIZE - SPACING);
 
-    QFont nameFont = KGlobalSettings::generalFont();
-    nameFont.setWeight(QFont::Bold);
+    const QFontMetrics nameFontMetrics(KGlobalSettings::generalFont());
 
-    const QFontMetrics nameFontMetrics(nameFont);
-
-    painter->setFont(nameFont);
     painter->drawText(userNameRect,
                       nameFontMetrics.elidedText(optV4.text, Qt::ElideRight, userNameRect.width()));
 
-    QFont statusFont = KGlobalSettings::smallestReadableFont();
-
-    const QFontMetrics statusFontMetrics(statusFont);
+    const QFontMetrics statusFontMetrics(KGlobalSettings::smallestReadableFont());
 
     QRect statusMsgRect = optV4.rect;
     statusMsgRect.setX(iconRect.x() + iconRect.width() + SPACING);
     statusMsgRect.setY(userNameRect.bottom() - statusFontMetrics.height() - 4);
     statusMsgRect.setWidth(statusMsgRect.width() - PRESENCE_ICON_SIZE - SPACING);
 
-    QColor fadingColor(m_palette->color(QPalette::WindowText));
+    QColor fadingColor(m_palette->color(QPalette::Disabled, QPalette::Text));
 
+    // if the index is hovered, set animated alpha to the color
     if (index == m_indexForHiding) {
         fadingColor.setAlpha(m_fadingValue);
-        painter->setPen(fadingColor);
     }
 
-    painter->setFont(statusFont);
+    painter->setPen(fadingColor);
+
+    painter->setFont(KGlobalSettings::smallestReadableFont());
     painter->drawText(statusMsgRect,
                       statusFontMetrics.elidedText(presence.statusMessage().simplified(),
                                                    Qt::ElideRight, statusMsgRect.width()));

-- 
ktp-contact-list packaging