[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=967070a

The following commit has been merged in the master branch:
commit 967070a661065f0a89358bd83463d85d2593c0b0
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Jan 10 16:04:06 2012 +0100

    Fix contact avatars with wrong aspect ratio.
    
    Reviewed-by: David Edmundson
---
 contact-delegate-compact.cpp | 2 +-
 contact-delegate.cpp         | 2 +-
 tooltips/contacttooltip.cpp  | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index 208fdee..510389d 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -81,7 +81,7 @@ void ContactDelegateCompact::paintContact(QPainter * painter, const QStyleOption
         avatar = SmallIcon("im-user", KIconLoader::SizeMedium);
     }
 
-    painter->drawPixmap(iconRect, avatar);
+    style->drawItemPixmap(painter, iconRect, Qt::AlignCenter, avatar.scaled(iconRect.size(), Qt::KeepAspectRatio));
 
     KTp::Presence presence = index.data(AccountsModel::PresenceRole).value<KTp::Presence>();
 
diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index a7bbd7f..84cb2c7 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -90,7 +90,7 @@ void ContactDelegate::paintContact(QPainter * painter, const QStyleOptionViewIte
         painter->setClipPath(roundedPath);
     }
 
-    painter->drawPixmap(iconRect, avatar);
+    style->drawItemPixmap(painter, iconRect, Qt::AlignCenter, avatar.scaled(iconRect.size(), Qt::KeepAspectRatio));
 
     if (!noContactAvatar) {
         painter->restore();
diff --git a/tooltips/contacttooltip.cpp b/tooltips/contacttooltip.cpp
index 45020dd..738bd5d 100644
--- a/tooltips/contacttooltip.cpp
+++ b/tooltips/contacttooltip.cpp
@@ -41,6 +41,8 @@ ContactToolTip::ContactToolTip(const QModelIndex &index) :
     ui->setupUi(this);
     ui->nameLabel->setText(index.data(Qt::DisplayRole).toString());
     ui->idLabel->setText(index.data(AccountsModel::IdRole).toString());
+    ui->avatarLabel->setScaledContents(false);
+    ui->avatarLabel->setAlignment(Qt::AlignCenter);
 
     QString avatar = index.data(AccountsModel::AvatarRole).toString();
     if (avatar.isEmpty()) {

-- 
ktp-contact-list packaging