From 356743116b510382942c617017a270eb27c8baed Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Thu, 15 Oct 2015 17:32:42 +0200
Subject: [PATCH] better behavior of the lock/unlock swipe

---
 .../homescreen/package/contents/ui/main.qml   | 46 +++++++++++++------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/containments/homescreen/package/contents/ui/main.qml b/containments/homescreen/package/contents/ui/main.qml
index 2cf7fb7a..8c7508d7 100644
--- a/containments/homescreen/package/contents/ui/main.qml
+++ b/containments/homescreen/package/contents/ui/main.qml
@@ -477,6 +477,7 @@ Item {
                 }
 
                 property var dragData
+                property bool wasLocked: true
 
                 cellWidth: root.width / 4
                 cellHeight: root.buttonHeight
@@ -491,21 +492,40 @@ Item {
                     if (draggingVertically) {
                         return;
                     }
+print("AAAAAA "+contentY+" "+(-headerItem.height + root.height)+" "+(-headerItem.height + root.height/5)+wasLocked)
 
-                    //manage separately the first page, the lockscreen
-                    //scrolling down
-                    if (verticalVelocity > 0 && contentY < -headerItem.height + root.height &&
-                        contentY > (-headerItem.height + root.height/6)) {
-                        scrollAnim.to = -headerItem.height +plasmoid.availableScreenRect.height
-                        scrollAnim.running = true;
-                        return;
+                    if (wasLocked) {
+                        //scrolling down, unlock
+                        if (contentY > (-headerItem.height + root.height/5)) {
+                            scrollAnim.to = -headerItem.height +plasmoid.availableScreenRect.height
+                            scrollAnim.running = true;
+                            wasLocked = false;
+                            return;
 
-                    //scrolling up
-                    } else if (verticalVelocity < 0 && contentY < -headerItem.height + root.height &&
-                        contentY < (-headerItem.height + root.height/6*5)) {
-                        scrollAnim.to = -headerItem.height;
-                        scrollAnim.running = true;
-                        return;
+                        //scrolling up, lock
+                        } else {
+                            scrollAnim.to = -headerItem.height;
+                            scrollAnim.running = true;
+                            wasLocked = true;
+                            return;
+                        }
+
+                    //was unlocked
+                    } else {
+                        //scrolling up, lock
+                        if (contentY < (-headerItem.height +  root.height - root.height/5)) {
+                            scrollAnim.to = -headerItem.height;
+                            scrollAnim.running = true;
+                            wasLocked = true;
+                            return;
+
+                        //scrolling down, unlock
+                        } else if (contentY < (-headerItem.height +  root.height + root.height/5)) {
+                            scrollAnim.to = -headerItem.height +plasmoid.availableScreenRect.height
+                            scrollAnim.running = true;
+                            wasLocked = false;
+                            return;
+                        }
                     }
                 }
                 NumberAnimation {