From c096ffb3665999ae9e9c41593b95c0258bcccc12 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Fri, 13 Mar 2015 14:42:37 +0100
Subject: [PATCH] bound the strip at top and bottom

except in the lockscreen it will slide away
---
 containments/homescreen/contents/ui/HomeLauncher.qml | 6 +++---
 containments/homescreen/contents/ui/main.qml         | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/containments/homescreen/contents/ui/HomeLauncher.qml b/containments/homescreen/contents/ui/HomeLauncher.qml
index 097fd87b..a7b8ae93 100644
--- a/containments/homescreen/contents/ui/HomeLauncher.qml
+++ b/containments/homescreen/contents/ui/HomeLauncher.qml
@@ -18,11 +18,11 @@ Item {
         opacity: (delegateItem.drag.target != null) ? 0.4 : 0
         Behavior on opacity {
         NumberAnimation {
-            duration: units.longDuration
-            easing.type: Easing.InOutQuad
+                duration: units.longDuration
+                easing.type: Easing.InOutQuad
+            }
         }
     }
-    }
     //animate index change
     onIdxChanged: {
         if (delegateItem.drag.target != null) {
diff --git a/containments/homescreen/contents/ui/main.qml b/containments/homescreen/contents/ui/main.qml
index b776405f..339c204f 100644
--- a/containments/homescreen/contents/ui/main.qml
+++ b/containments/homescreen/contents/ui/main.qml
@@ -237,7 +237,10 @@ Item {
                 SatelliteStripe {
                     id: stripe
                     z: 99
-                    y: Math.max(applicationsView.contentY + parent.height, parent.height - height)
+                    property int viewPos: applicationsView.contentItem.height * applicationsView.visibleArea.yPosition
+
+                    y: Math.max(viewPos, 
+                          Math.min(parent.height, viewPos + root.height) - height + Math.max(0, -(parent.height - height + applicationsView.contentY)))
 
                     PlasmaCore.Svg {
                         id: stripeIcons