Merge lp:~fboucault/unity-2d/scrollbar_drag_control_y into lp:unity-2d/3.0

[Florian Boucault]

[dash] Only move the scrollbar depending on the flickable's visible area when the user is not dragging the scrollbar.

[Ugo Riboni (uriboni)]

Code looks good, even though i'm not really sure what's the purpose of this change.

review: Approve

=== modified file 'places/Scrollbar.qml'
--- places/Scrollbar.qml	2011-06-23 17:08:53 +0000
+++ places/Scrollbar.qml	2011-07-14 16:47:25 +0000
@@ -72,11 +72,17 @@
         anchors.left: parent.left
         anchors.right: parent.right
 
-        y: {
-            var clampedYPosition = Math.max(0, Math.min(1-targetFlickable.visibleArea.heightRatio,
-                                                        targetFlickable.visibleArea.yPosition))
-            return clampedYPosition * scrollbar.height
+        Binding {
+            target: slider
+            property: "y"
+            value: {
+                var clampedYPosition = Math.max(0, Math.min(1-targetFlickable.visibleArea.heightRatio,
+                                                            targetFlickable.visibleArea.yPosition))
+                return clampedYPosition * scrollbar.height
+            }
+            when: !dragMouseArea.drag.active
         }
+
         height: Math.max(minimalHeight, targetFlickable.visibleArea.heightRatio * scrollbar.height)
 
         Behavior on height {NumberAnimation {duration: 200; easing.type: Easing.InOutQuad}}