[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=0155f6e

The following commit has been merged in the master branch:
commit 0155f6e20848f5ce25a09137d85e03db175c9cf1
Author: Nikita Skovoroda <chalkerx at gmail.com>
Date:   Tue Jun 26 01:21:43 2012 +0100

    Remove 1px line at edge of contact list by drawing our own branches.
    
    REVIEW: 105342
---
 contact-list-widget.cpp | 13 +++++++++++++
 contact-list-widget.h   |  1 +
 2 files changed, 14 insertions(+)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 30c84ba..ee65883 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -765,3 +765,16 @@ void ContactListWidget::paintEvent(QPaintEvent *event)
         style()->drawPrimitive(QStyle::PE_IndicatorItemViewItemDrop, &option, &painter, this);
     }
 }
+
+void ContactListWidget::drawBranches(QPainter *painter, const QRect &rect, const QModelIndex &index) const
+{
+    Q_UNUSED(painter);
+    Q_UNUSED(rect);
+    Q_UNUSED(index);
+
+    // There is a 0px identation set in the constructor, with setIndentation(0).
+    // Because of that, no branches are shown, so they should be disabled completely (overriding drawBranches).
+    // Leaving branches enabled with 0px identation results in a 1px branch line on the left of all items,
+    // which looks like an artifact.
+    //See https://bugreports.qt-project.org/browse/QTBUG-26305
+}
diff --git a/contact-list-widget.h b/contact-list-widget.h
index 911c0f2..724050d 100644
--- a/contact-list-widget.h
+++ b/contact-list-widget.h
@@ -89,6 +89,7 @@ protected:
     virtual void dragEnterEvent(QDragEnterEvent *event);
     virtual void dragMoveEvent(QDragMoveEvent *event);
     virtual void dragLeaveEvent(QDragLeaveEvent *event);
+    virtual void drawBranches(QPainter *painter, const QRect &rect, const QModelIndex &index) const;
 
 private:
     void requestFileTransferChannels(const Tp::AccountPtr& account,

-- 
ktp-contact-list packaging