Merge lp:~tpeeters/ubuntu-ui-toolkit/panelHeight into lp:ubuntu-ui-toolkit/staging

[Tim Peeters]

Don't automatically close a Panel when the user presses next to it, and update Panel position when its height changes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1137
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/548/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1538
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1330/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/380/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/380
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/380/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/380/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1818
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2520
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2520/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9260
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1494/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/548/rebuild

review: Needs Fixing (continuous-integration)

[Andrew Hayzen (ahayzen)]

This resolves bug 1336563 for me, using the example branch provided in the bug, thanks Tim :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1139
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/579/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1819/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1531
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/411
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/411
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/411/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/411
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2081/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2904
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2904/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9643
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1718
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1718/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/579/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

Please add a test case to verify the position ie. y-coordinate after changing height.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1141
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/617/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2136
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1787/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/449
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/449
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/449/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/449
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2355
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3292
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3292/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10006
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1496/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2000
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2000/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/617/rebuild

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

> Please add a test case to verify the position ie. y-coordinate after changing
> height.

Done; ready for review.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1142
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/624/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2209
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1842
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/456
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/456
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/456/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/456
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2419
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3384
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3384/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10099
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1546
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2061
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2061/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/624/rebuild

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

jenkins failing on this bug https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1328600

[Cris Dywan (kalikiana)]

Nice. Thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/272/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2239
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1860
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/216
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/216/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/216
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2442
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3423
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3423/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1564
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2079
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2079/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

=== modified file 'CHANGES'
--- CHANGES	2014-06-04 20:45:16 +0000
+++ CHANGES	2014-07-19 00:10:50 +0000
@@ -108,6 +108,7 @@
 * CHANGED IN Page: Automatic detection of flickable inside a Page to control the header is now limited to Flickables that are anchored to the top of the Page or fill the Page. Header automatically shows when flickable.contentHeight becomes <= flickable.height.
 * CHANGED IN Action, ActionItem, OptionSelectorDelegate: Setting iconName now always selects the requested icon from ubuntu-mobile theme, not the system icon theme.
 * CHANGED IN TabBar: The model now needs to have a selectedIndex property.
+* CHANGED IN Panel: The panel no longer closes automatically when the user presses outside of the opened panel. That was deprecated behavior that was useful in the first version of the Toolbar. Set __closeOnContentsClicks to restore the old behavior, but a better solution is to deal with the press in the app and call Panel.close() when needed.
 
 SDK 0.1.46
 ##########

=== modified file 'modules/Ubuntu/Components/Panel.qml'
--- modules/Ubuntu/Components/Panel.qml	2014-04-25 12:53:58 +0000
+++ modules/Ubuntu/Components/Panel.qml	2014-07-19 00:10:50 +0000
@@ -443,13 +443,13 @@
       \internal
       \deprecated
       Enable the InverseMouseArea that closes the panel when the user clicks outside of the panel.
-      This functionality moved to the Toolbar/Page implementation because the mouse area needs to
-      access with the toolbar and header, but this InverseMouseArea is still in the Panel for backwards
-      compatibility in apps that use it directly. Default value is true, but it is set to false in Toolbar.
+      This functionality moved to the MainView to deal with Toolbar hiding, but this InverseMouseArea
+      is still in the Panel for backwards compatibility in apps that use it directly.
+      Default value is false.
 
       FIXME: Remove __closeOnContentsClicks and the IMA below when all apps use Toolbar instead of Panel.
      */
-    property bool __closeOnContentsClicks: true
+    property bool __closeOnContentsClicks: false
     Toolkit.InverseMouseArea {
         anchors.fill: draggingArea
         onPressed: {
@@ -625,6 +625,7 @@
 
     Item {
         id: bar
+        objectName: "bar_item"
         height: parent.height
         width: parent.width
         anchors {
@@ -637,6 +638,7 @@
         property real size: internal.orientation === Qt.Horizontal ? height : width
         //position will always be in the range 0..size, where position==0 means spread, position==size means hidden.
         property real position: panel.opened ? 0 : size
+        onSizeChanged: position = panel.opened ? 0 : size
 
         y: internal.align === Qt.AlignTop ? -position : internal.align === Qt.AlignBottom ? position : 0
         x: internal.align === Qt.AlignLeft ? -position : internal.align === Qt.AlignRight ? position : 0

=== modified file 'tests/unit_x11/tst_components/tst_panel.qml'
--- tests/unit_x11/tst_components/tst_panel.qml	2014-04-23 08:50:20 +0000
+++ tests/unit_x11/tst_components/tst_panel.qml	2014-07-19 00:10:50 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.Components 1.1
+import Ubuntu.Test 1.0
 
 Item {
     width: 200
@@ -37,7 +38,7 @@
         }
     }
 
-    TestCase {
+    UbuntuTestCase {
         id: testCase
         name: "PanelAPI"
         when: windowShown
@@ -61,6 +62,21 @@
             compare(panel.align, Qt.AlignBottom, "Can set align to bottom");
         }
 
+        function test_height() {
+            var bar = findChild(panel, "bar_item");
+            // panel is not opened
+            panel.height = 123;
+            compare(bar.y, 123, "Panel is properly closed after changing height");
+            panel.open(); wait(500);
+            compare(bar.y, 0, "Panel opens properly after changing height");
+            panel.height = 78;
+            compare(bar.y, 0, "Panel stays propery opened after changing height");
+            panel.close(); wait(500);
+            compare(bar.y, 78, "Panel closes properly after changing height");
+            panel.height = root.height / 2;
+            compare(bar.y, root.height/2, "Panel stays closed properly after changing height");
+        }
+
         function test_opened() {
             panel.open();
             compare(panel.opened, true, "Can set opened");
@@ -167,10 +183,14 @@
         }
 
         function test_clickToDeactivate() {
+            // deprecated test. This functionality is only there for backwards compatibility
+            panel.__closeOnContentsClicks = true;
             panel.open();
             compare(panel.opened && panel.align === Qt.AlignBottom, true, "Panel is opened and bottom-aligned");
             mouseClick(root, root.width / 2, 5, Qt.LeftButton);
             compare(panel.opened, false, "Panel is deactivated by clicking in the view outside of the panel");
+            // reset property to default value
+            panel.__closeOnContentsClicks = false;
         }
 
         function test_hideTimeout_bug1249031() {