Merge lp:~aacid/unity8/fix_overflow_menu_regression into lp:unity8

[Albert Astals Cid]

Hook up aboutToShow for overflow menus

 * Are there any related MPs required for this MP to build/function as expected?
No

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

 * 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

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

PASSED: Continuous integration, rev:2892
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3545/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4703
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2856
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2856
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4731
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4554
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4554/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4554
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4554/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4554
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4554/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4554
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4554/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4554
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4554/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4554
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4554/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

Yup, works fine

* 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

=== modified file 'qml/ApplicationMenus/MenuBar.qml'
--- qml/ApplicationMenus/MenuBar.qml	2017-03-21 10:56:10 +0000
+++ qml/ApplicationMenus/MenuBar.qml	2017-03-27 09:50:49 +0000
@@ -370,6 +370,9 @@
                     function activate(index) {
                         return sourceModel.activate(mapRowToSource(index));
                     }
+                    function aboutToShow(index) {
+                        return sourceModel.aboutToShow(mapRowToSource(index));
+                    }
                 }
 
                 Connections {

=== modified file 'tests/qmltests/ApplicationMenus/tst_MenuBar.qml'
--- tests/qmltests/ApplicationMenus/tst_MenuBar.qml	2017-03-21 10:56:10 +0000
+++ tests/qmltests/ApplicationMenus/tst_MenuBar.qml	2017-03-27 09:50:49 +0000
@@ -329,6 +329,14 @@
                 return false;
             }, true);
 
+            mouseClick(overflow);
+            verify(overflow.__popup);
+            var menuItem = findChild(menuBar, "overflow-menu-item0-actionItem");
+            waitForRendering(menuItem);
+            mouseClick(menuItem);
+
+            verify(findChild(menuBar, "overflow-menu-item0-menu-item0-actionItem"));
+
             tryCompareFunction(function() {
                 menuBackend.removeRow(0);
                 wait(1);