Merge lp:~tpeeters/ubuntu-ui-toolkit/doc-flickable into lp:ubuntu-ui-toolkit

[Tim Peeters]

Update header behavior:
- Do not automatically hide the header when scrolling in a flickable that is not anchored to the top of the page.
- Automatically show the header when flickable's contentHeight becomes less than flickable.height.
- Update documentation for Page.flickable.

Update header behavior:
- Do not automatically hide the header when scrolling in a flickable that is not anchored to the top of the page.
- Automatically show the header when flickable's contentHeight becomes less than flickable.height.
- Update documentation for Page.flickable.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:555
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/192/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/49/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/49/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/86/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-autolanding/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-autolanding/12/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:556
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/193/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/50/console

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

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/doc-flickable]

557. By Tim Peeters on 2013-06-21

update tests

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:557
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/194/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/51
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/51/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/doc-flickable]

558. By Tim Peeters on 2013-07-01

merge trunk

[Zsombor Egri (zsombi)]

looks good

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:558
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/247/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/104
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/104
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/104/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'CHANGES'
--- CHANGES	2013-06-19 09:46:09 +0000
+++ CHANGES	2013-07-01 11:22:42 +0000
@@ -43,6 +43,7 @@
 
 - CHANGED IN Tabs: Automatically show the header when the title of the active tab changes
 - CHANGED IN Page/MainView: Only enable auto-hide behavior of header when the Page's flickable can be flicked vertically, so that manual setting of anchors is no longer needed for flickables that only flick horizontally
+- 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.
 
 SDK 0.1.46
 ##########

=== modified file 'modules/Ubuntu/Components/Header.qml'
--- modules/Ubuntu/Components/Header.qml	2013-05-14 13:33:39 +0000
+++ modules/Ubuntu/Components/Header.qml	2013-07-01 11:22:42 +0000
@@ -116,6 +116,7 @@
                 flickable.contentYChanged.connect(internal.scrollContents);
                 flickable.movementEnded.connect(internal.movementEnded);
                 flickable.interactiveChanged.connect(internal.interactiveChanged);
+                flickable.contentHeightChanged.connect(internal.contentHeightChanged);
             }
             previousFlickable = flickable;
         }
@@ -143,6 +144,13 @@
         }
 
         /*
+          Content height of flickable changed
+         */
+        function contentHeightChanged() {
+            if (flickable && flickable.height >= flickable.contentHeight) header.show();
+        }
+
+        /*
           Flickable became interactive or non-interactive.
          */
         function interactiveChanged() {

=== modified file 'modules/Ubuntu/Components/Page.qml'
--- modules/Ubuntu/Components/Page.qml	2013-06-14 16:28:04 +0000
+++ modules/Ubuntu/Components/Page.qml	2013-07-01 11:22:42 +0000
@@ -85,8 +85,38 @@
 
     /*!
       Optional flickable that controls the header. This property
-      is automatically set if the Flickable is one of the Page's direct children.
-      May be set to null to avoid the header from hiding.
+      is automatically set to the first child of the page that is Flickable
+      and anchors to the top of the page or fills the page. For example:
+      \qml
+        import QtQuick 2.0
+        import Ubuntu.Components 0.1
+
+        MainView {
+            width: units.gu(30)
+            height: units.gu(50)
+            Page {
+                id: page
+                title: "example"
+                //flickable: null // uncomment to disable hiding of the header
+                Flickable {
+                    id: content
+                    anchors.fill: parent
+                    contentHeight: units.gu(70)
+                    Label {
+                        text: "hello"
+                        anchors.centerIn: parent
+                    }
+                }
+            }
+        }
+      \endqml
+      In this example, page.flickable will automatically be set to content because it is
+      a Flickable and it fills its parent. Thus, scrolling down in the Flickable will automatically
+      hide the header.
+
+      This property be set to null to avoid automatic flickable detection, which disables hiding
+      of the header by scrolling in the Flickable. In cases where a flickable should control the header,
+      but it is not automatically detected, the flickable property can be set.
      */
     property Flickable flickable: internal.getFlickableChild(page)
 
@@ -136,7 +166,7 @@
         function isVerticalFlickable(object) {
             if (object && object.hasOwnProperty("flickableDirection") && object.hasOwnProperty("contentHeight")) {
                 var direction = object.flickableDirection;
-                if ( (direction === Flickable.AutoFlickDirection && (object.contentHeight !== object.height))
+                if ( ((direction === Flickable.AutoFlickDirection) && (object.contentHeight !== object.height) )
                         || direction === Flickable.VerticalFlick
                         || direction === Flickable.HorizontalAndVerticalFlick) {
                     return true;
@@ -151,7 +181,12 @@
         function getFlickableChild(item) {
             if (item && item.hasOwnProperty("children")) {
                 for (var i=0; i < item.children.length; i++) {
-                    if (internal.isVerticalFlickable(item.children[i])) return item.children[i];
+                    var child = item.children[i];
+                    if (internal.isVerticalFlickable(child)) {
+                        if (child.anchors.top === page.top || child.anchors.fill === page) {
+                            return item.children[i];
+                        }
+                    }
                 }
             }
             return null;

=== modified file 'tests/unit/tst_components/tst_tabs.qml'
--- tests/unit/tst_components/tst_tabs.qml	2013-05-22 09:38:09 +0000
+++ tests/unit/tst_components/tst_tabs.qml	2013-07-01 11:22:42 +0000
@@ -115,6 +115,7 @@
                 page: Page {
                     Flickable {
                         id: flickable1
+                        anchors.fill: parent
                     }
                 }
             }
@@ -123,6 +124,7 @@
                 page: Page {
                     Flickable {
                         id: flickable2
+                        anchors.fill: parent
                     }
                 }
             }
@@ -142,6 +144,7 @@
                 property Flickable flick: loadedFlickable
                 Flickable {
                     id: loadedFlickable
+                    anchors.fill: parent
                     contentHeight: 1000
                 }
             }