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

[Albert Astals Cid]

Make the double click on a menu not be maximize the window below

 * 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)]

FAILED: Continuous integration, rev:2776
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3043/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3958
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2314
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2314
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3986
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3832
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3832/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3832
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3832/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3832
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3832/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3832
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3832/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3832
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3832/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3832
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3832/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/noClickThroughMenus]

2777. By Albert Astals Cid on 2017-01-26

Merge

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

FAILED: Continuous integration, rev:2777
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3052/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3968/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3996
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3841
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3841/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3841
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3841/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3841/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3841
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3841/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3841
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3841/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3841
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3841/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:2777
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3056/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3972
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2323
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2323
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4000
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3845
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3845/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3845
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3845/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3845
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3845/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3845
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3845/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3845
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3845/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3845
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3845/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

tested this, it does change the behavior a bit, however, double clicking still maximizes the window behind it for me. The difference is that with trunk, the first click doesn't close the menu and the double click just goes through too and maximizes the window. With this branch, the first click makes the menu close, so the second click obviously goes to the windeco behind, however, it still counts as a double click and maximizes the window. In theory the second click should only be recognized as a single click on the windeco, given the first click has been eaten by the menu, no?

review: Needs Information

[Michael Zanetti (mzanetti)]

ok, I tested it a bit wrong. the issue it is actually supposed to fix, is fixed fine.

ci is happy too

review: Approve

[lp:~aacid/unity8/noClickThroughMenus]

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

Merge

=== modified file 'qml/ApplicationMenus/MenuItem.qml'
--- qml/ApplicationMenus/MenuItem.qml	2016-12-13 09:56:20 +0000
+++ qml/ApplicationMenus/MenuItem.qml	2017-02-07 15:46:24 +0000
@@ -140,11 +140,4 @@
             name: "chevron"
         }
     }
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: {
-            root.trigger(action && action.checkable ? !action.checked : undefined);
-        }
-    }
 }

=== modified file 'qml/ApplicationMenus/MenuPopup.qml'
--- qml/ApplicationMenus/MenuPopup.qml	2017-02-07 15:46:24 +0000
+++ qml/ApplicationMenus/MenuPopup.qml	2017-02-07 15:46:24 +0000
@@ -221,7 +221,6 @@
                 MouseArea {
                     anchors.fill: parent
                     hoverEnabled: true
-                    propagateComposedEvents: true // propogate events so we send clicks to children.
                     z: 1 // on top so we override any other hovers
                     onEntered: updateCurrentItemFromPosition(Qt.point(mouseX, mouseY))
                     onPositionChanged: updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))
@@ -243,6 +242,14 @@
                             }
                         }
                     }
+
+                    onClicked: {
+                        var pos = mapToItem(listView.contentItem, mouse.x, mouse.y);
+                        var clickedItem = menuColumn.childAt(pos.x, pos.y);
+                        if (clickedItem.enabled && !clickedItem.__isSeparator) {
+                            clickedItem.item.trigger();
+                        }
+                    }
                 }
 
                 ActionContext {

=== modified file 'tests/qmltests/Stage/tst_DesktopStage.qml'
--- tests/qmltests/Stage/tst_DesktopStage.qml	2017-02-07 15:46:24 +0000
+++ tests/qmltests/Stage/tst_DesktopStage.qml	2017-02-07 15:46:24 +0000
@@ -930,5 +930,30 @@
                 compare(menu.y, normalPositioningY);
             }
         }
+
+        function test_menuDoubleClickNoMaximizeWindowBehind() {
+            var appDelegate1 = startApplication("dialer-app");
+            var appDelegate2 = startApplication("gmail-webapp");
+
+            // Open menu
+            var menuItem = findChild(appDelegate2, "menuBar-item3");
+            menuItem.show();
+            var menu = findChild(appDelegate2, "menuBar-item3-menu");
+            menuItem = findChild(menu, "menuBar-item3-menu-item3-actionItem");
+            tryCompare(menuItem, "visible", true);
+
+            // Place the other application window decoration under the menu
+            var pos = menuItem.mapToItem(null, menuItem.width / 2, menuItem.height / 2);
+            appDelegate1.windowedX = pos.x - appDelegate1.width / 2;
+            appDelegate1.windowedY = pos.y - units.gu(1);
+
+            var previousWindowState = appDelegate1.windowState;
+
+            mouseMove(menuItem);
+            mouseDoubleClickSequence(menuItem);
+
+            expectFail("", "Double clicking a menu should not change the window below");
+            tryCompareFunction(function() { return appDelegate1.windowState != previousWindowState; }, true);
+        }
     }
 }