[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=7a7fc85

The following commit has been merged in the master branch:
commit 7a7fc85e9f83d51abb3009f668e20e10d199114a
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Jul 15 16:19:59 2012 +0100

    Use correct pen colour when writing text on highlighted delegates
    
    Reviewed-by: Martin Klapetek
---
 abstract-contact-delegate.cpp |  2 +-
 contact-delegate-compact.cpp  | 15 +++++++++++----
 contact-delegate.cpp          | 14 ++++++++++++--
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/abstract-contact-delegate.cpp b/abstract-contact-delegate.cpp
index 852d2f6..f5f2a05 100644
--- a/abstract-contact-delegate.cpp
+++ b/abstract-contact-delegate.cpp
@@ -122,7 +122,7 @@ void AbstractContactDelegate::paintHeader(QPainter *painter, const QStyleOptionV
     if (option.state & QStyle::State_HasFocus) {
         painter->setPen(m_palette->color(QPalette::Active, QPalette::HighlightedText));
     } else {
-        painter->setPen(m_palette->color(QPalette::Inactive, QPalette::WindowText));
+        painter->setPen(m_palette->color(QPalette::Active, QPalette::WindowText));
     }
 
     painter->setFont(groupFont);
diff --git a/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index 4a4c1a5..948e5a8 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -116,6 +116,12 @@ void ContactDelegateCompact::paintContact(QPainter * painter, const QStyleOption
 
     const QFontMetrics nameFontMetrics(nameFont);
 
+    if (option.state & QStyle::State_HasFocus) {
+        painter->setPen(m_palette->color(QPalette::Active, QPalette::HighlightedText));
+    } else {
+        painter->setPen(m_palette->color(QPalette::Active, QPalette::WindowText));
+    }
+
     painter->setFont(nameFont);
 
     QRect userNameRect = optV4.rect;
@@ -131,10 +137,11 @@ void ContactDelegateCompact::paintContact(QPainter * painter, const QStyleOption
     presenceMessageRect.setWidth(optV4.rect.width() - presenceMessageRect.x() - rightIconsWidth);
     presenceMessageRect.setY(presenceMessageRect.y() + (presenceMessageRect.height()/2 - nameFontMetrics.height()/2));
 
-    QPen presenceMessagePen = painter->pen();
-    presenceMessagePen.setColor(m_palette->color(QPalette::Disabled, QPalette::Text));
-
-    painter->setPen(presenceMessagePen);
+    if (option.state & QStyle::State_HasFocus) {
+        painter->setPen(m_palette->color(QPalette::Disabled, QPalette::HighlightedText));
+    } else {
+        painter->setPen(m_palette->color(QPalette::Disabled, QPalette::WindowText));
+    }
 
     painter->drawText(presenceMessageRect,
                       nameFontMetrics.elidedText(presence.statusMessage().simplified(),
diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index af77d0e..f468bec 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -133,6 +133,12 @@ void ContactDelegate::paintContact(QPainter *painter, const QStyleOptionViewItem
 
     const QFontMetrics nameFontMetrics(KGlobalSettings::generalFont());
 
+    if (option.state & QStyle::State_HasFocus) {
+        painter->setPen(m_palette->color(QPalette::Active, QPalette::HighlightedText));
+    } else {
+        painter->setPen(m_palette->color(QPalette::Active, QPalette::WindowText));
+    }
+    
     painter->drawText(userNameRect,
                       nameFontMetrics.elidedText(optV4.text, Qt::ElideRight, userNameRect.width()));
 
@@ -150,8 +156,12 @@ void ContactDelegate::paintContact(QPainter *painter, const QStyleOptionViewItem
         fadingColor.setAlpha(m_fadingValue);
     }
 
-    painter->setPen(fadingColor);
-
+    if (option.state & QStyle::State_HasFocus) {
+        painter->setPen(m_palette->color(QPalette::Disabled, QPalette::HighlightedText));
+    } else {
+        painter->setPen(m_palette->color(QPalette::Disabled, QPalette::WindowText));
+    }
+    
     painter->setFont(KGlobalSettings::smallestReadableFont());
     painter->drawText(statusMsgRect,
                       statusFontMetrics.elidedText(presence.statusMessage().simplified(),

-- 
ktp-contact-list packaging