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

[Tim Peeters]

Fix incorrect header contents width when navigating back from a page with a lot of actions.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1379
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1358/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/787
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/88
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/88/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/85
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/685
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/785
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/785/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17037

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

review: Needs Fixing (continuous-integration)

[Andrew Hayzen (ahayzen)]

This fixes the issue detailed in the bug, thanks :)

review: Approve

[Zsombor Egri (zsombi)]

Too simple! You should make it more complicated ;)

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2014-11-25 15:20:11 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2015-01-13 15:54:13 +0000
@@ -512,6 +512,9 @@
                 id: actionsOverflowButton
                 objectName: "actions_overflow_button"
                 visible: numberOfSlots.requested > numberOfSlots.right
+                // Ensure resetting of X when this button is not visible to avoid
+                // miscalculation of actionsContainer.width. Fixes bug #1408481.
+                onVisibleChanged: if (!visible) x = 0
                 iconName: "contextual-menu"
                 color: headerStyle.buttonColor
                 height: actionsContainer.height

=== added file 'tests/unit_x11/tst_components/tst_header_contents_width.qml'
--- tests/unit_x11/tst_components/tst_header_contents_width.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_header_contents_width.qml	2015-01-13 15:54:13 +0000
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+import Ubuntu.Test 1.0
+import Ubuntu.Components 1.1
+
+Item {
+    width: units.gu(50)
+    height: units.gu(80)
+
+    MainView {
+        id: mainView
+        anchors.fill: parent
+        useDeprecatedToolbar: false
+
+        Tabs {
+            id: tabs
+            Tab {
+                title: "Search"
+                page: Page {
+                    head.contents: TextField {
+                        id: searchField
+                        anchors {
+                            left: parent ? parent.left : undefined
+                            right: parent ? parent.right : undefined
+                            rightMargin: units.gu(1)
+                        }
+                        placeholderText: i18n.tr("Search...")
+                    }
+                }
+            }
+            Tab {
+                title: "Actions"
+                page: Page {
+                    head.actions: [
+                        Action {
+                            iconName: "add"
+                        },
+                        Action {
+                            iconName: "clear"
+                        },
+                        Action {
+                            iconName: "delete"
+                        }
+                    ]
+                }
+            }
+        }
+    }
+
+    UbuntuTestCase {
+        name: "HeaderSelectionPreset"
+        when: windowShown
+        id: testCase
+
+        property var head_style
+
+        function wait_for_animation() {
+            tryCompareFunction(function(){return testCase.head_style.animating}, false);
+        }
+        function initTestCase() {
+            testCase.head_style = findChild(mainView, "PageHeadStyle");
+            testCase.wait_for_animation();
+        }
+
+        function test_header_contents_width_bug1408481() {
+            var initialWidth = searchField.width;
+            testCase.verify(initialWidth > 0, "Initial width has a positive value.");
+            // Select the tab that has more actions.
+            tabs.selectedTabIndex = 1;
+            testCase.wait_for_animation();
+            // Now less space is available for the header contents, so that the action buttons fit.
+            testCase.verify(searchField.width < initialWidth, "Contents width is reduced.");
+            // Without this wait(), the test does not reproduce bug 1408481.
+            wait(100);
+            // Select the first tab again:
+            tabs.selectedTabIndex = 0;
+            testCase.wait_for_animation();
+            // Without actions in tab one, the full width is available again for contents
+            testCase.verify(searchField.width === initialWidth, "Contents width is reset.");
+        }
+    }
+}