[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=31a273e

The following commit has been merged in the master branch:
commit 31a273e6969b8af0ab9766d90d2b790b24f28233
Author: Aleix Pol <aleixpol at kde.org>
Date:   Fri Feb 28 13:20:21 2014 +0100

    Remove the scrollbar from the ChatWidget
    
    It's not working properly and it's not that useful since if you want to
    browse you'll end up in the windowed version anyway. So it makes sense.
    
    Reviewed by David Edmundson (he did frown over the removing of the scroll
    bar, but he understood it's needed).
---
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
index fb1fbbd..7f84daa 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
@@ -148,7 +148,7 @@ FocusScope {
             left: parent.left
             right: parent.right
             bottom: disconnectedLabel.top
-            rightMargin: viewScrollBar.width+5
+            rightMargin: 5
             leftMargin: 5
         }
         boundsBehavior: Flickable.StopAtBounds
@@ -188,24 +188,6 @@ FocusScope {
         }
     }
 
-    PlasmaComponents.ScrollBar {
-        id: viewScrollBar
-        anchors {
-            top: view.top
-            bottom: view.bottom
-            right: parent.right
-        }
-
-        flickableItem: view
-        orientation: Qt.Vertical
-        opacity: view.atYEnd ? 0.3 : 1
-        stepSize: 0
-
-        Behavior on width { NumberAnimation { duration: 250 } }
-        Behavior on opacity { NumberAnimation { duration: 250 } }
-    }
-
-
     PlasmaComponents.Label {
         id: disconnectedLabel
         visible: !conv.valid

-- 
ktp-contact-applet packaging