[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=95fa056

The following commit has been merged in the master branch:
commit 95fa0567c34fb7845e3da25c5aa489b4785f47c2
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Nov 22 23:44:45 2012 +0100

    Fix size and spacing in compact delegate
    
    Reviewed-by: Martin Klapetek <martin.klapetek at gmail.com>
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
---
 contact-delegate-compact.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index 7fedb1f..3b3753b 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -155,10 +155,12 @@ QSize ContactDelegateCompact::sizeHintContact(const QStyleOptionViewItem &option
 void ContactDelegateCompact::setListMode(ContactDelegateCompact::ListSize size)
 {
     if (size == ContactDelegateCompact::Mini) {
-        m_spacing = 2;
-        m_avatarSize = IconSize(KIconLoader::Toolbar);
-        m_presenceIconSize = qMax(12, KGlobalSettings::smallestReadableFont().pixelSize() + m_spacing);
-        m_clientTypeIconSize = qMax(12, KGlobalSettings::smallestReadableFont().pixelSize() + m_spacing);
+        m_spacing = 1;
+        int iconSize = qMax(KIconLoader::global()->currentSize(KIconLoader::Small),
+                            KGlobalSettings::smallestReadableFont().pixelSize() + m_spacing);
+        m_avatarSize = iconSize;
+        m_presenceIconSize = iconSize;
+        m_clientTypeIconSize = iconSize;
     } else if (size == ContactDelegateCompact::Normal) {
         m_spacing = 4;
         m_avatarSize = IconSize(KIconLoader::Toolbar);

-- 
ktp-contact-list packaging