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

[Albert Astals Cid]

Make the MenuBar InverseMouseArea eat hover events when there's a popup open

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

 * 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:2778
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3064/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3985
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2332
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2332
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4013
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3857
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3857/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3857
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3857/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3857
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3857/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3857
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3857/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3857
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3857/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3857
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3857/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

works fine, looks good. CI happy too

review: Approve

[lp:~aacid/unity8/eatHoverWhenMenuIsOpen]

2779. By Albert Astals Cid on 2017-02-07

Merge

=== modified file 'qml/ApplicationMenus/MenuBar.qml'
--- qml/ApplicationMenus/MenuBar.qml	2017-02-07 15:46:50 +0000
+++ qml/ApplicationMenus/MenuBar.qml	2017-02-07 15:46:50 +0000
@@ -75,6 +75,7 @@
         acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
         anchors.fill: parent
         enabled: d.currentItem != null
+        hoverEnabled: enabled && d.currentItem.__popup != null
         onPressed: d.dismissAll()
     }
 

=== modified file 'tests/qmltests/Stage/tst_DesktopStage.qml'
--- tests/qmltests/Stage/tst_DesktopStage.qml	2017-02-07 15:46:50 +0000
+++ tests/qmltests/Stage/tst_DesktopStage.qml	2017-02-07 15:46:50 +0000
@@ -955,5 +955,22 @@
             expectFail("", "Double clicking a menu should not change the window below");
             tryCompareFunction(function() { return appDelegate1.windowState != previousWindowState; }, true);
         }
+
+        function test_openMenuEatsHoverOutsideIt() {
+            var appDelegate = startApplication("gmail-webapp");
+
+            var wd = findChild(appDelegate, "appWindowDecoration");
+            var closeButton = findChild(wd, "closeWindowButton");
+
+            // Open menu
+            var menuItem = findChild(appDelegate, "menuBar-item3");
+            menuItem.show();
+            var menu = findChild(appDelegate, "menuBar-item3-menu");
+            tryCompare(menu, "visible", true);
+
+            mouseMove(closeButton, closeButton.width/2, closeButton.height/2);
+            expectFail("", "Hovering the window controls should be ignored when the menu is open");
+            tryCompare(closeButton, "containsMouse", true);
+        }
     }
 }