[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=2ae1626

The following commit has been merged in the master branch:
commit 2ae16264b5a539c53966850a846ef7295d46546b
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Nov 22 16:34:32 2011 +0100

    Save some real estate with the full contacts view
    
    Reviewed-by: David Edmundson
---
 contact-delegate.cpp | 14 +++++++-------
 contact-overlays.cpp |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index b5d7c7c..7d1218d 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -131,7 +131,7 @@ void ContactDelegate::paintContact(QPainter * painter, const QStyleOptionViewIte
 
     QRect userNameRect = optV4.rect;
     userNameRect.setX(iconRect.x() + iconRect.width() + SPACING);
-    userNameRect.setY(userNameRect.y() + 3);
+    userNameRect.setY(userNameRect.y() + 2);
     userNameRect.setWidth(userNameRect.width() - PRESENCE_ICON_SIZE - SPACING);
 
     QFont nameFont = KGlobalSettings::smallestReadableFont();
@@ -144,15 +144,15 @@ void ContactDelegate::paintContact(QPainter * painter, const QStyleOptionViewIte
     painter->drawText(userNameRect,
                       nameFontMetrics.elidedText(optV4.text, Qt::ElideRight, userNameRect.width()));
 
-    QRect statusMsgRect = optV4.rect;
-    statusMsgRect.setX(iconRect.x() + iconRect.width() + SPACING);
-    statusMsgRect.setY(userNameRect.top() + 16);
-    statusMsgRect.setWidth(statusMsgRect.width() - PRESENCE_ICON_SIZE - SPACING);
-
     QFont statusFont = KGlobalSettings::smallestReadableFont();
 
     const QFontMetrics statusFontMetrics(statusFont);
 
+    QRect statusMsgRect = optV4.rect;
+    statusMsgRect.setX(iconRect.x() + iconRect.width() + SPACING);
+    statusMsgRect.setY(userNameRect.bottom() - statusFontMetrics.height() - 4);
+    statusMsgRect.setWidth(statusMsgRect.width() - PRESENCE_ICON_SIZE - SPACING);
+
     QColor fadingColor(m_palette->color(QPalette::WindowText));
 
     if (index == m_indexForHiding) {
@@ -173,7 +173,7 @@ QSize ContactDelegate::sizeHintContact(const QStyleOptionViewItem &option, const
 {
     Q_UNUSED(option);
     Q_UNUSED(index);
-    return QSize(0, 32 + 4 * SPACING);
+    return QSize(0, 32 + 2 * SPACING);
 }
 
 void ContactDelegate::hideStatusMessageSlot(const QModelIndex& index)
diff --git a/contact-overlays.cpp b/contact-overlays.cpp
index 409b0f8..b72904e 100644
--- a/contact-overlays.cpp
+++ b/contact-overlays.cpp
@@ -100,7 +100,7 @@ void StartChannelContactOverlay::updateButton(const QModelIndex& index)
     const QRect rect = m_view->visualRect(index);
     const QSize size = button()->size();
 
-    const int gap = 5;
+    const int gap = 2;
     const int x   = rect.left() + m_xpos; // rect.right() - gap - 96 - size.width();
     const int y   = rect.bottom() - gap - size.height();
     button()->move(QPoint(x, y));

-- 
ktp-contact-list packaging