Merge lp:~cimi/unity8/fix-1595116 into lp:unity8

[Andrea Cimitan]

Use binding for filter popover contentWidth

 * Are there any related MPs required for this MP to build/function as expected? Please list.
n
 * Did you perform an exploratory manual test run of your code change and any related functionality?
y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
 * If you changed the UI, has there been a design review?
n/a

[Albert Astals Cid (aacid)]

Could you add a test in which manually change the scopeview width to be bigger and smaller and check the width of the popup follows?

review: Needs Information

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2529
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1667/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2212
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1177
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1177
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1177
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2240
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2146
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2146
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2146
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2137
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2137/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2137
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2137/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2137
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2137/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2137
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2137/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2137
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2137/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2137
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2137/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2137
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2137/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2137
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2137/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2137
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2137/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1667/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

> Could you add a test in which manually change the scopeview width to be bigger
> and smaller and check the width of the popup follows?

done

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass? If not, please explain why.
Yes

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2530
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1669/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2214/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2242
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2148
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2148
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2148
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2139/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2139/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2139/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2139/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2139/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2139/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2139/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2139/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2139/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1669/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

wops
tst_DashContent.qml: bad whitespace in line 527

review: Needs Fixing

[Albert Astals Cid (aacid)]

Ah was fixed in r2531 already

[Albert Astals Cid (aacid)]

review: Approve

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2016-06-27 18:41:15 +0000
+++ qml/Dash/GenericScopeView.qml	2016-07-05 12:38:21 +0000
@@ -662,7 +662,7 @@
             }
             onShowFiltersPopup: { // item
                 extraPanel.visible = false;
-                scopeView.filtersPopover = PopupUtils.open(Qt.resolvedUrl("FiltersPopover.qml"), item, { "contentWidth": scopeView.width - units.gu(2) } );
+                scopeView.filtersPopover = PopupUtils.open(Qt.resolvedUrl("FiltersPopover.qml"), item, { "contentWidth": Qt.binding(function() { return scopeView.width - units.gu(2); } ) } );
                 scopeView.filtersPopover.Component.onDestruction.connect(function () {
                     categoryView.pageHeader.closePopup(false, true);
                     categoryView.pageHeader.unfocus(true); // remove the focus from the search field

=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
--- tests/qmltests/Dash/tst_DashContent.qml	2016-06-21 08:20:32 +0000
+++ tests/qmltests/Dash/tst_DashContent.qml	2016-07-05 12:38:21 +0000
@@ -524,18 +524,30 @@
             var peExtraPanel = findChild(dashContentList.currentItem, "peExtraPanel");
             var headerContainer = findChild(pageHeader, "headerContainer");
 
+            mouseClick(searchButton);
+            tryCompare(peExtraPanel, "visible", true);
+
+            var filtersPopover = findChild(shell, "filtersPopover")
+            verify(!filtersPopover);
+
+            mouseClick(settingsButton);
+
+            filtersPopover = findChild(shell, "filtersPopover")
+            verify(filtersPopover);
+
+            // test that popover resizes
+            var shellWidth = shell.width;
+            var popoverWidth = filtersPopover.contentWidth;
+
+            shell.width = shellWidth + units.gu(60);
+            waitForRendering(shell);
+
+            tryCompare(filtersPopover, "contentWidth", popoverWidth + units.gu(60));
+
+            shell.width = shellWidth;
+            waitForRendering(shell);
+
             // test that closing the filters popover without a search unfocuses and removes the navigation
-            mouseClick(searchButton);
-            tryCompare(peExtraPanel, "visible", true);
-
-            var filtersPopover = findChild(shell, "filtersPopover")
-            verify(!filtersPopover);
-
-            mouseClick(settingsButton);
-
-            filtersPopover = findChild(shell, "filtersPopover")
-            verify(filtersPopover);
-
             mouseClick(shell, shell.width - 1, shell.height - 1);
 
             tryCompare(pageHeader.extraPanel, "visible", false);