Merge lp:~nick-dedekind/unity8/indicator.redrag into lp:unity8

[Nick Dedekind]

Indicator re-select by dragging from top when fully opened.

Indicator re-select by dragging from top when fully opened.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:327
http://jenkins.qa.ubuntu.com/job/unity8-ci/1055/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3735
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1263
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1780
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1056
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1056/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1055
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3747
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3747/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1265
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1265/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1057
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1069

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1055/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

This not ready?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:328
http://10.97.0.26:8080/job/unity8-ci/1300/
Executed test runs:
    FAILURE: http://10.97.0.26:8080/job/generic-mediumtests-saucy/4714/console
    FAILURE: http://10.97.0.26:8080/job/generic-mediumtests-touch/2526/console
    UNSTABLE: http://10.97.0.26:8080/job/unity-phablet-qmluitests-saucy/2154
    FAILURE: http://10.97.0.26:8080/job/unity8-saucy-amd64-ci/323/console
    FAILURE: http://10.97.0.26:8080/job/unity8-saucy-armhf-ci/1300/console
    FAILURE: http://10.97.0.26:8080/job/unity8-saucy-i386-ci/1299/console
    FAILURE: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-amd64/589/console
    FAILURE: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-armhf/2528/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1300/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:329
http://10.97.0.26:8080/job/unity8-ci/1302/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-saucy/4716
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-touch/2531
    UNSTABLE: http://10.97.0.26:8080/job/unity-phablet-qmluitests-saucy/2156
    SUCCESS: http://10.97.0.26:8080/job/unity8-saucy-amd64-ci/325
    SUCCESS: http://10.97.0.26:8080/job/unity8-saucy-armhf-ci/1302
        deb: http://10.97.0.26:8080/job/unity8-saucy-armhf-ci/1302/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/unity8-saucy-i386-ci/1301
    SUCCESS: http://10.97.0.26:8080/job/autopilot-testrunner-otto-saucy/899
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-amd64/591
        deb: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-amd64/591/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-armhf/2533
        deb: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-armhf/2533/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-runner-maguro/2085
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-runner-mako/2099

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1302/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Yup, looks nice!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:329
http://jenkins.qa.ubuntu.com/job/unity8-ci/1403/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/5004
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2921
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/426
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1403
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1403/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1402
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/879
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/879/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2923
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2923/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2431
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2474

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1403/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:330
http://jenkins.qa.ubuntu.com/job/unity8-ci/1410/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/5014
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2938
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2277
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/433
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1410
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1410/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1409
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/889
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/889/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2940
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2940/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2447
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2490

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1410/rebuild

review: Needs Fixing (continuous-integration)

[Nick Dedekind (nick-dedekind)]

Design have given this the OK now.

[Michael Zanetti (mzanetti)]

tests missing. Should we unapprove before jenkins comes back to life?

review: Needs Information

[Michał Sawicz (saviq)]

Yeah, let's add QML tests for this, please.

review: Needs Fixing

[Michael Zanetti (mzanetti)]

After talking to Saviq on irc we agreed that tests for this should be fairly easy to add and we should do it rather now than later. Changing my vote to needs fixing and putting back to needs review.

review: Needs Fixing

[lp:~nick-dedekind/unity8/indicator.redrag]

331. By Nick Dedekind on 2013-11-06

Added test for redrag indicator.

[Nick Dedekind (nick-dedekind)]

> After talking to Saviq on irc we agreed that tests for this should be fairly
> easy to add and we should do it rather now than later. Changing my vote to
> needs fixing and putting back to needs review.

Test added.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:331
http://jenkins.qa.ubuntu.com/job/unity8-ci/1590/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/527/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/515/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/114
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/114/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/114
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/486/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/527
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/527/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/515
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/515/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3166/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1146

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1590/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:331
http://jenkins.qa.ubuntu.com/job/unity8-ci/1593/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/552
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/117
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/117/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/509
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/552
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/552/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/540
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/540/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/3007
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3189
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1198
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1196

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1593/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Yay!

review: Approve

=== modified file 'Panel/Indicators.qml'
--- Panel/Indicators.qml	2013-10-09 16:36:05 +0000
+++ Panel/Indicators.qml	2013-11-06 14:24:39 +0000
@@ -38,6 +38,7 @@
     property bool partiallyOpened: height > panelHeight && !fullyOpened
     property real visualBottom: Math.max(y+height, y+indicatorRow.y+indicatorRow.height)
     property bool contentEnabled: true
+    property bool initalizeItem: true
     readonly property alias content: menuContent
 
     // TODO: Perhaps we need a animation standard for showing/hiding? Each showable seems to
@@ -64,14 +65,13 @@
     }
 
     height: panelHeight
+    onHeightChanged: updateRevealProgressState(indicators.height - panelHeight, true)
 
-    onHeightChanged: {
-        // need to use handle.get_height(). As the handle height depends on indicators.height changes (but this is called first!)
-        var revealProgress = indicators.height - panelHeight
+    function updateRevealProgressState(revealProgress, enableRelease) {
         if (!showAnimation.running && !hideAnimation.running) {
-            if (revealProgress == 0) {
+            if (revealProgress === 0) {
                 indicators.state = "initial";
-            } else if (revealProgress <= hintValue) {
+            } else if (revealProgress > 0 && revealProgress <= hintValue) {
                 indicators.state = "hint";
             } else if (revealProgress > hintValue && revealProgress < lockThreshold) {
                 indicators.state = "reveal";
@@ -80,7 +80,7 @@
             }
         }
 
-        if (revealProgress == 0) {
+        if (enableRelease && revealProgress === 0) {
             menuContent.releaseContent();
         }
     }
@@ -107,7 +107,7 @@
           Vertical velocity check. Don't change the indicator if we're moving too quickly.
         */
         var verticalSpeed = Math.abs(yVelocityCalculator.calculate());
-        if (verticalSpeed >= 0.05 && indicatorRow.currentItem!=null) {
+        if (verticalSpeed >= 0.05 && !initalizeItem) {
             return;
         }
 
@@ -147,6 +147,7 @@
         } else if (!currentItem) {
             indicatorRow.setDefaultItem();
         }
+        initalizeItem = indicatorRow.currentItem == null;
     }
 
     // eater
@@ -282,6 +283,33 @@
                 enableIndexChangeSignal = oldActive;
             }
         }
+
+        EdgeDragArea {
+            id: rowDragArea
+            anchors.fill: indicatorRow
+            direction: Direction.Downwards
+            maxSilenceTime: 2000
+            distanceThreshold: 0
+
+            enabled: fullyOpened
+            onDraggingChanged: {
+                if (dragging) {
+                    initalizeItem = true;
+                    updateRevealProgressState(Math.max(touchSceneY - panelHeight, hintValue), false);
+                    indicators.calculateCurrentItem(touchX, false);
+                } else {
+                    indicators.state = "commit";
+                }
+            }
+
+            onTouchXChanged: {
+                indicators.calculateCurrentItem(touchX, true);
+            }
+            onTouchSceneYChanged: {
+                updateRevealProgressState(Math.max(touchSceneY - panelHeight, hintValue), false);
+                yVelocityCalculator.trackedPosition = touchSceneY;
+            }
+        }
     }
 
     Connections {
@@ -298,7 +326,7 @@
         onRunningChanged: {
             if (hideAnimation.running) {
                 indicators.state = "initial";
-                indicatorRow.currentItem = null;
+                initalizeItem = true;
             }
         }
     }

=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
--- tests/qmltests/Panel/tst_Panel.qml	2013-08-22 18:37:09 +0000
+++ tests/qmltests/Panel/tst_Panel.qml	2013-11-06 14:24:39 +0000
@@ -48,9 +48,12 @@
 
         function get_window_data() {
             return [
-            {tag: "pinned", fullscreenFlag: false },
-            {tag: "fullscreen", fullscreenFlag: true }
-        ]}
+                {tag: "pinned", fullscreenFlag: false, alreadyOpen: false },
+                {tag: "fullscreen", fullscreenFlag: true, alreadyOpen: false },
+                {tag: "pinned-alreadyOpen", fullscreenFlag: false, alreadyOpen: true },
+                {tag: "fullscreen-alreadyOpen", fullscreenFlag: true, alreadyOpen: true }
+            ];
+        }
 
 
         function init() {
@@ -135,6 +138,10 @@
         // expose more of the panel, binding it to the selected indicator and opening it's menu.
         function test_drag_show(data) {
             panel.fullscreenMode = data.fullscreenFlag;
+            if (data.alreadyOpen) {
+                panel.indicators.show();
+                tryCompare(panel.indicators, "fullyOpened", true);
+            }
 
             var indicatorRow = findChild(panel.indicators, "indicatorRow");
             verify(indicatorRow != undefined);
@@ -186,7 +193,9 @@
                 compare(menuContent.currentMenuIndex, i, "Menu conetent should be enabled for item at position " + i);
 
                 // init for next indicatorItem
-                init();
+                if (!data.alreadyOpen) {
+                    init();
+                }
             }
         }