[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=d3699b7

The following commit has been merged in the master branch:
commit d3699b78f1af238cb1057b4e74d227be4baa9b5e
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Feb 20 01:04:42 2013 +0000

    Use PlasmaExtras ScrollArea rather than having our own scrollbar
    
    Seems to fix an issue in which the scrollbars didn't quite match properly
    Simplifies code
    
    REVIEW: Aleix Pol
---
 .../contents/ui/ContactList.qml                    | 34 +++++++---------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml
index 44f2a0c..b5ad784 100644
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml
@@ -20,6 +20,7 @@
 import QtQuick 1.1
 import org.kde.telepathy 0.1 as KTp
 import org.kde.plasma.components 0.1 as PlasmaComponents
+import org.kde.plasma.extras 0.1 as PlasmaExtras
 import org.kde.plasma.core 0.1 as PlasmaCore
 
 
@@ -31,34 +32,19 @@ Item {
         id: contactList
     }
     
-    ListView {
-        id: contactsList
+    PlasmaExtras.ScrollArea {
+        anchors.fill: parent
 
-        anchors {
-            top: parent.top
-            left: parent.left
-            right: viewScrollBar.left
-            bottom: parent.bottom
-        }
+        flickableItem: ListView {
+            id: contactsList
 
-        clip: true
-        model: contactList.model
-        boundsBehavior: Flickable.StopAtBounds
+            clip: true
+            model: contactList.model
+            boundsBehavior: Flickable.StopAtBounds
 
-        delegate: ListContactDelegate {}
-        focus: true
-    }
-    
-    PlasmaComponents.ScrollBar {
-        id: viewScrollBar
-        anchors {
-            top: parent.top
-            bottom: parent.bottom
-            right: parent.right
+            delegate: ListContactDelegate {}
+            focus: true
         }
-
-        flickableItem: contactsList
-        orientation: Qt.Vertical
     }
     
     Component.onCompleted: {

-- 
ktp-contact-applet packaging