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

The following commit has been merged in the master branch:
commit 2260944e24158f62ee8331dddc61740ae7d201a5
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Nov 22 23:23:09 2012 +0900

    Fix a bug in which model items could be rendered with a white font on white.
    
    REVIEW: 107430
    BUG: 310081
    FIXED-IN: 0.5.2
---
 abstract-contact-delegate.cpp | 2 +-
 contact-delegate-compact.cpp  | 4 ++--
 contact-delegate.cpp          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/abstract-contact-delegate.cpp b/abstract-contact-delegate.cpp
index bc92109..6d317d0 100644
--- a/abstract-contact-delegate.cpp
+++ b/abstract-contact-delegate.cpp
@@ -117,7 +117,7 @@ void AbstractContactDelegate::paintHeader(QPainter *painter, const QStyleOptionV
     QRect textRect = groupLabelRect.adjusted(ACCOUNT_ICON_SIZE + (SPACING*4),0,0,0);
     QString groupHeaderString =  index.data(Qt::DisplayRole).toString().append(counts);
 
-    if (option.state & QStyle::State_HasFocus) {
+    if (option.state & QStyle::State_Selected) {
         painter->setPen(option.palette.color(QPalette::Active, QPalette::HighlightedText));
     } else {
         painter->setPen(option.palette.color(QPalette::Active, QPalette::Text));
diff --git a/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index fcaffe6..6628141 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -118,7 +118,7 @@ void ContactDelegateCompact::paintContact(QPainter * painter, const QStyleOption
 
     const QFontMetrics nameFontMetrics(nameFont);
 
-    if (option.state & QStyle::State_HasFocus) {
+    if (option.state & QStyle::State_Selected) {
         painter->setPen(option.palette.color(QPalette::Active, QPalette::HighlightedText));
     } else {
         painter->setPen(option.palette.color(QPalette::Active, QPalette::Text));
@@ -139,7 +139,7 @@ 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));
 
-    if (option.state & QStyle::State_HasFocus) {
+    if (option.state & QStyle::State_Selected) {
         painter->setPen(option.palette.color(QPalette::Disabled, QPalette::HighlightedText));
     } else {
         painter->setPen(option.palette.color(QPalette::Disabled, QPalette::Text));
diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index 01137f3..cd14b6f 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -130,7 +130,7 @@ void ContactDelegate::paintContact(QPainter *painter, const QStyleOptionViewItem
 
     const QFontMetrics nameFontMetrics(KGlobalSettings::generalFont());
 
-    if (option.state & QStyle::State_HasFocus) {
+    if (option.state & QStyle::State_Selected) {
         painter->setPen(option.palette.color(QPalette::Active, QPalette::HighlightedText));
     } else {
         painter->setPen(option.palette.color(QPalette::Active, QPalette::Text));
@@ -147,7 +147,7 @@ void ContactDelegate::paintContact(QPainter *painter, const QStyleOptionViewItem
     statusMsgRect.setWidth(statusMsgRect.width() - rightIconsWidth);
 
     QColor fadingColor;
-    if (option.state & QStyle::State_HasFocus) {
+    if (option.state & QStyle::State_Selected) {
         fadingColor = QColor(option.palette.color(QPalette::Disabled, QPalette::HighlightedText));
     } else {
         fadingColor = QColor(option.palette.color(QPalette::Disabled, QPalette::Text));

-- 
ktp-contact-list packaging