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

The following commit has been merged in the master branch:
commit fa1b15ea79d7ab4fcea2fd257367f4ab5ee81410
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
Date:   Thu Apr 10 17:21:15 2014 +0200

    Make group headers for "minimalistic contact list" smaller
    
    Reviewed-by: Martin Klapetek <martin.klapetek at gmail.com>
---
 abstract-contact-delegate.h  |  2 +-
 contact-delegate-compact.cpp | 12 ++++++++++++
 contact-delegate-compact.h   |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/abstract-contact-delegate.h b/abstract-contact-delegate.h
index 23246d6..2339833 100644
--- a/abstract-contact-delegate.h
+++ b/abstract-contact-delegate.h
@@ -52,11 +52,11 @@ protected:
     virtual void paintContact(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const = 0;
     /** The size hint for painting contact items*/
     virtual QSize sizeHintContact(const QStyleOptionViewItem &option, const QModelIndex &index) const = 0;
+    virtual QSize sizeHintHeader(const QStyleOptionViewItem &option, const QModelIndex &index) const;
 
 private:
     /** Paints header items*/
     void paintHeader(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
-    QSize sizeHintHeader(const QStyleOptionViewItem &option, const QModelIndex &index) const;
 };
 
 #endif // ABSTRACT_CONTACT_DELEGATE_H
diff --git a/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index 15fc814..c51a210 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -169,6 +169,18 @@ QSize ContactDelegateCompact::sizeHintContact(const QStyleOptionViewItem &option
     return QSize(0, qMax(m_avatarSize + 2 * m_spacing, KGlobalSettings::smallestReadableFont().pixelSize() + m_spacing));
 }
 
+QSize ContactDelegateCompact::sizeHintHeader(const QStyleOptionViewItem& option, const QModelIndex& index) const
+{
+    Q_UNUSED(option);
+    Q_UNUSED(index);
+
+    if (m_listSize == ContactDelegateCompact::Mini) {
+        return QSize(0, qMax(m_avatarSize + 2 * m_spacing, KGlobalSettings::smallestReadableFont().pixelSize() + m_spacing));
+    } else {
+        return AbstractContactDelegate::sizeHintHeader(option, index);
+    }
+}
+
 void ContactDelegateCompact::setListMode(ContactDelegateCompact::ListSize size)
 {
     if (size == ContactDelegateCompact::Mini) {
diff --git a/contact-delegate-compact.h b/contact-delegate-compact.h
index e6013d5..736d2e5 100644
--- a/contact-delegate-compact.h
+++ b/contact-delegate-compact.h
@@ -37,6 +37,7 @@ public:
 
     void paintContact(QPainter *painter, const QStyleOptionViewItem & option, const QModelIndex & index) const;
     QSize sizeHintContact(const QStyleOptionViewItem & option, const QModelIndex & index) const;
+    QSize sizeHintHeader(const QStyleOptionViewItem &option, const QModelIndex &index) const;
 
     void setListMode(ContactDelegateCompact::ListSize size);
 

-- 
ktp-contact-list packaging