Merge lp:~tpeeters/ubuntu-ui-toolkit/emptyHeader into lp:ubuntu-ui-toolkit

[Tim Peeters]

Disable header when it does not have contents or title.

Disable header when it does not have contents or title.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:411
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/969/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/969
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=amd64/969
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=i386/969

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:412
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/970/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/970
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=amd64/970
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=i386/970

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

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/Header.qml'
--- modules/Ubuntu/Components/Header.qml	2013-03-27 11:11:43 +0000
+++ modules/Ubuntu/Components/Header.qml	2013-04-04 19:43:21 +0000
@@ -46,6 +46,8 @@
     }
     height: Theming.ComponentUtils.delegateProperty(header, "height", units.gu(10))
 
+    visible: title || contents
+
     /*!
       Show the header
      */
@@ -63,16 +65,14 @@
     /*!
       The text to display in the header
      */
-    property string title
-    onTitleChanged: {
-        if (title) header.show();
-        else header.hide();
-    }
+    property string title: ""
+    onTitleChanged: contentsChanged()
 
     /*!
       The contents of the header. If this is set, \l title will be ignored.
      */
     property Component contents: null
+    onContentsChanged: header.show()
 
     /*!
       The flickable that controls the movement of the header.

=== modified file 'modules/Ubuntu/Components/Page.qml'
--- modules/Ubuntu/Components/Page.qml	2013-03-08 12:45:26 +0000
+++ modules/Ubuntu/Components/Page.qml	2013-04-04 19:43:21 +0000
@@ -116,7 +116,7 @@
         onHeaderHeightChanged: internal.updateFlickableMargins()
         Component.onCompleted: internal.updateFlickableMargins()
 
-        property real headerHeight: page.header ? page.header.height : 0
+        property real headerHeight: page.header && page.header.visible ? page.header.height : 0
 
         function isFlickable(object) {
             return object && object.hasOwnProperty("flicking") && object.hasOwnProperty("flickableDirection");

=== modified file 'tests/unit/tst_components/tst_page.qml'
--- tests/unit/tst_components/tst_page.qml	2013-03-12 18:48:37 +0000
+++ tests/unit/tst_components/tst_page.qml	2013-04-04 19:43:21 +0000
@@ -18,34 +18,63 @@
 import QtTest 1.0
 import Ubuntu.Components 0.1
 
-TestCase {
-    name: "PageAPI"
-
-    function test_title() {
-        compare(page.title, "", "is not set by default")
-        compare(mainView.header.title, "", "header title is not set by default")
-        var newTitle = "Hello World!"
-        page.title = newTitle
-        compare(page.title, newTitle, "can set/get")
-        compare(mainView.header.title, newTitle, "header title updated by changing page title")
-    }
-
-    function test_tools() {
-        compare(mainView.toolbar.tools, page.tools, "Page updates toolbar tools");
-    }
-
-    function test_active() {
-        compare(page.active, true, "Page is active by default");
-    }
-
-    function test_pageStack() {
-        compare(page.pageStack, null, "is not set by default")
-    }
+Item {
+    width: 200
+    height: 200
 
     MainView {
+        anchors.fill: parent
         id: mainView
         Page {
             id: page
         }
     }
+
+    TestCase {
+        name: "PageAPI"
+        when: windowShown
+
+        function initTestCase() {
+            compare(page.title, "", "is not set by default")
+            compare(page.header, mainView.header, "page header equals mainView header")
+            compare(page.header.title, page.title, "header title is same as page title")
+            compare(page.header.visible, false, "header is not visible initially because there is no title")
+        }
+
+        function test_0_noHeader_bug1162028_bug1161910() {
+            compare(mainView.header.title, "", "no header title by default")
+            compare(mainView.header.visible, false, "header is hidden when title is not set")
+            compare(page.height, mainView.height, "page uses full height when there is no header")
+        }
+
+        function test_title() {
+            var newTitle = "Hello World!"
+            page.title = newTitle
+            compare(page.title, newTitle, "can set/get")
+            page.title = ""
+            compare(page.title, "", "can unset")
+        }
+
+        function test_header() {
+            var newTitle = "Hello header!"
+            page.title = newTitle
+            compare(mainView.header.title, newTitle, "header title updated by changing page title")
+            compare(mainView.header.visible, true, "header is visible when title is set")
+            page.title = ""
+            compare(mainView.header.title, "", "header title unset by unsetting page title")
+            compare(mainView.header.visible, false, "header is hidden when title is unset")
+        }
+
+        function test_tools() {
+            compare(mainView.toolbar.tools, page.tools, "Page updates toolbar tools");
+        }
+
+        function test_active() {
+            compare(page.active, true, "Page is active by default");
+        }
+
+        function test_pageStack() {
+            compare(page.pageStack, null, "is not set by default")
+        }
+    }
 }