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

The following commit has been merged in the master branch:
commit a71518dfbad2931f33e261dd48ee6973bd809b93
Author: Aleix Pol <aleixpol at kde.org>
Date:   Wed Aug 1 14:01:51 2012 +0200

    Improve behavior while chatting
    
    Follow the conversation only if the last time the user scrolled,
    scrolled to the end.
    
    For proper enjoyment of this feature, I'd recommend to use a KDE 4.9.1
    that will have the fix discussed in the reviewboard.
    
    REVIEW: 105811
    BUG: 293522
---
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
index 5eea8b7..6ba6005 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
@@ -122,6 +122,8 @@ Item {
 
     ListView {
         id: view
+        property bool followConversation: true
+
         anchors {
             top: space.bottom
             left: parent.left
@@ -138,7 +140,6 @@ Item {
 
         delegate: Loader {
             Component.onCompleted: {
-                console.log(model.type);
                 switch(model.type) {
                     case MessagesModel.MessageTypeOutgoing:
 //                             console.log("Type: MessagesModel::MessageTypeOutgoing");
@@ -156,9 +157,10 @@ Item {
         }
 
         model: conv.messages
+        onMovementEnded: followConversation = atYEnd //we only follow the conversation if moved to the end
 
         onCountChanged: {
-            if((view.contentHeight-view.contentY)<(1.2*view.height)) {
+            if(!moving && followConversation && contentHeight>height) {
                 view.positionViewAtEnd()
             }
         }

-- 
ktp-contact-applet packaging