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

[Tim Peeters]

Don't unset the subheader style when Page.head changes because that unsets the parent of Page.head.contents.

[lp:~tpeeters/ubuntu-ui-toolkit/headercontents]

1621. By Tim Peeters on 2015-08-27

update comment

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1621
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2183/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/911
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/913
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/913/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/910

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

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

That looks sensible.

review: Approve

=== modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml'
--- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2015-08-17 09:49:23 +0000
+++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2015-08-27 21:11:48 +0000
@@ -537,7 +537,7 @@
                 }
                 height: body.headerHeight
 
-                styleName: config ? "PageHeadStyle" : ""
+                styleName: "PageHeadStyle"
                 theme.version: Ubuntu.toolkitVersion
                 objectName: "Header" + column
 

=== modified file 'tests/unit_x11/tst_components/tst_multicolumnheader.qml'
--- tests/unit_x11/tst_components/tst_multicolumnheader.qml	2015-07-28 15:04:07 +0000
+++ tests/unit_x11/tst_components/tst_multicolumnheader.qml	2015-08-27 21:11:48 +0000
@@ -61,6 +61,14 @@
                     onClicked: layout.addPageToNextColumn(
                                    rootPage, Qt.resolvedUrl("MyExternalPage.qml"))
                 }
+                ListItemWithLabel {
+                    text: "Add page with head contents left"
+                    onClicked: layout.addPageToCurrentColumn(rootPage, headContentsPage)
+                }
+                ListItemWithLabel {
+                    text: "Add page with head contents right"
+                    onClicked: layout.addPageToNextColumn(rootPage, headContentsPage)
+                }
             }
         }
         Page {
@@ -108,6 +116,14 @@
                 color: "blue"
             }
         }
+        Page {
+            id: headContentsPage
+            head.contents: Rectangle {
+                id: headRectangle
+                color: UbuntuColors.orange
+                anchors.fill: parent
+            }
+        }
     }
 
     UbuntuTestCase {
@@ -340,5 +356,20 @@
             compare(get_back_button_visible(0), false,
                     "Back button remains visible after removing page from following column.");
         }
+
+        function test_head_contents_visible_bug1488922() {
+            layout.addPageToCurrentColumn(rootPage, headContentsPage);
+            // The bug occurred when the style for the subheader was unset
+            //  after a short delay, so wait before testing Page.head.contents.parent.
+            wait(100);
+            compare(headRectangle.visible, true, "Head contents not visible in current column.");
+            compare(headRectangle.parent == null, false, "Head contents has no parent in current column.");
+            layout.removePages(headContentsPage);
+            layout.addPageToNextColumn(rootPage, headContentsPage);
+            wait(100);
+            compare(headRectangle.visible, true, "Head contents not visible in next column.");
+            compare(headRectangle.parent == null, false, "Head contents has no parent in next column.");
+            layout.removePages(headContentsPage);
+        }
     }
 }