Merge lp:~nick-dedekind/ubuntu-ui-toolkit/prevent-slider-mouse-stealing into lp:ubuntu-ui-toolkit

[Nick Dedekind]

Prevent the mouse events from being stolen while dragging the slider.

Prevent the mouse events from being stolen while dragging the slider.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1188
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2202/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2712/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/893/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2710/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1073/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2202/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

I'm a bit suspicious of the unit test.. why are you removing the interactive check?

review: Needs Fixing

Unmerged revisions

1188. By Nick Dedekind on 2015-05-11

Prevent mouse stealing while sliding

=== modified file 'modules/Ubuntu/Components/Slider.qml'
--- modules/Ubuntu/Components/Slider.qml	2015-04-10 06:52:20 +0000
+++ modules/Ubuntu/Components/Slider.qml	2015-05-11 15:01:41 +0000
@@ -135,26 +135,6 @@
         property real dragInitMouseX: 0.0
         property real dragInitNormalizedValue: 0.0
 
-        property Flickable flickable: {
-            // traverse parents to catch whether we have an ancestor Flickable
-            var pl = slider.parent;
-            while (pl) {
-                if (pl.hasOwnProperty("flicking")) {
-                    return pl;
-                }
-                pl = pl.parent;
-            }
-            return null;
-        }
-
-        states: State {
-            name: "sliding"
-            when: mouseArea.flickable && mouseArea.pressed
-            PropertyChanges {
-                target: mouseArea.flickable
-                interactive: false
-            }
-        }
         function normalizedValueFromValue(value) {
             if (Qt.application.layoutDirection == Qt.RightToLeft) {
                 return MathUtils.clampAndProject(value, slider.minimumValue,
@@ -197,11 +177,13 @@
             if (!slider.live) {
                 slider.value = liveValue;
             }
+            preventStealing = true;
         }
         onPositionChanged: {
             // Left button dragging
             var normalizedOffsetX = (mouseArea.mouseX - dragInitMouseX) / barMinusThumb;
             liveValue = valueFromNormalizedValue(dragInitNormalizedValue + normalizedOffsetX);
+            preventStealing = true;
         }
         onClicked: slider.requestFocus(Qt.MouseFocusReason)
         onLiveValueChanged: if (isPressed) slider.requestFocus(Qt.MouseFocusReason)
 
=== modified file 'tests/unit_x11/tst_components/tst_slider.qml'
--- tests/unit_x11/tst_components/tst_slider.qml	2015-03-03 13:20:06 +0000
+++ tests/unit_x11/tst_components/tst_slider.qml	2015-05-11 15:01:41 +0000
@@ -32,7 +32,7 @@
         UbuntuListView {
             id: listView
             width: parent.width
-            height: units.gu(20)
+            height: units.gu(15)
             clip: true
             model: 10
             delegate: Standard {
@@ -44,7 +44,7 @@
         UbuntuListView {
             id: listView2
             width: parent.width
-            height: units.gu(20)
+            height: units.gu(15)
             clip: true
             model: 10
             delegate: Slider {
@@ -54,7 +54,7 @@
         Flickable {
             id: flickable
             width: parent.width
-            height: units.gu(20)
+            height: units.gu(15)
             clip: true
             contentHeight: column.height
             Column {
@@ -74,7 +74,7 @@
         Flickable {
             id: flickable2
             width: parent.width
-            height: units.gu(20)
+            height: units.gu(15)
             clip: true
             contentHeight: column2.height
             Column {
@@ -89,6 +89,34 @@
                 }
             }
         }
+
+        Flickable {
+            id: flickable3
+            width: parent.width
+            height: units.gu(15)
+            clip: true
+            contentWidth: flickable4.width
+
+            Flickable {
+                id: flickable4
+                height: parent.height
+                width: units.gu(40)
+                clip: true
+                contentHeight: column3.height
+
+                Column {
+                    id: column3
+                    width: parent.width
+                    height: childrenRect.height
+                    Repeater {
+                        model: 10
+                        Slider {
+                            objectName: "testSlider" + index
+                        }
+                    }
+                }
+            }
+        }
     }
 
     UbuntuTestCase {
@@ -111,6 +139,7 @@
                 {tag: "ListView with Slider alone", flickable: listView2},
                 {tag: "Flickable with Column of Slider in ListItem", flickable: flickable},
                 {tag: "Flickable with Column of Slider alone", flickable: flickable2},
+                {tag: "Nested Flickable with Column of Slider alone", flickable: flickable3},
             ];
         }
 
@@ -122,7 +151,6 @@
             mouseDrag(data.flickable, sliderPos.x, sliderPos.y, units.gu(20), units.gu(20));
             waitForRendering(data.flickable, 200);
             compare(flickSpy.count, 0, "The Flickable should not move while Slider is active.");
-            compare(data.flickable.interactive, true, "The Flickable aint got back to interactive mode.");
         }
     }
 }