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

[Albert Astals Cid]

Eat hover events when the launcher quicklist is open

This way we don't change the mouse cursor wrongly to resize windows for example

 * Are there any related MPs required for this MP to build/function as expected?
Prereq (well probably not really needed, but easier to build on the top of fixes)

 * 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

[Michael Zanetti (mzanetti)]

why do we need two mouse areas with hoverEnabled? Also I'm not sure why the change in Launcher.qml is required.

review: Needs Information

[Albert Astals Cid (aacid)]

We need the one in LauncherPanel to filter everything outside the quicklist and we need the one in Launcher to filter the quicklist itself.

> Also I'm not sure why the change in Launcher.qml is required.
You mean the enabled: change to include !root.lockedVisible? It's not really needed but saves up some cpu if you're running with that mode since otherwise the inversemousearea is executing contains() for every single move, and it's not really cheap.

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

PASSED: Continuous integration, rev:2779
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3078/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4001
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2344
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2344
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4029
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3873
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3873/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3873
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3873/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3873
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3873/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3873
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3873/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3873
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3873/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3873
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3873/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~aacid/unity8/eatHoverWhenLauncherMenuIsOpen]

2801. By Albert Astals Cid on 2017-01-31

Eat hover events when the launcher quicklist is open

This way we don't change the mouse cursor wrongly to resize windows for example

2802. By Albert Astals Cid on 2017-01-31

Put the test in a different place so merges better

Unmerged revisions

=== modified file 'qml/Launcher/Launcher.qml'
--- qml/Launcher/Launcher.qml	2017-01-24 07:42:24 +0000
+++ qml/Launcher/Launcher.qml	2017-01-31 14:34:39 +0000
@@ -307,7 +307,8 @@
     InverseMouseArea {
         id: closeMouseArea
         anchors.fill: panel
-        enabled: root.state == "visible" || root.state == "drawer"
+        enabled: (root.state == "visible" && !root.lockedVisible) || root.state == "drawer" || hoverEnabled
+        hoverEnabled: panel.quickListOpen
         visible: enabled
         onPressed: {
             mouse.accepted = false;
 
=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2017-01-16 11:12:00 +0000
+++ qml/Launcher/LauncherPanel.qml	2017-01-31 14:34:39 +0000
@@ -35,6 +35,7 @@
                                  || dndArea.containsMouse || dashItem.hovered
     property int highlightIndex: -2
     property bool shortcutHintsShown: false
+    readonly property bool quickListOpen: quickList.state === "open"
 
     signal applicationSelected(string appId)
     signal showDashHome()
@@ -686,6 +687,8 @@
     InverseMouseArea {
         anchors.fill: quickListShape
         enabled: quickList.state == "open" || pressed
+        hoverEnabled: enabled
+        visible: enabled
 
         onClicked: {
             quickList.state = "";
 
=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2017-01-24 07:43:54 +0000
+++ tests/qmltests/tst_Shell.qml	2017-01-31 14:34:39 +0000
@@ -2732,6 +2732,28 @@
             keyRelease(Qt.Key_W, Qt.MetaModifier)
         }
 
+        function test_launcherWindowResizeInteraction()
+        {
+            loadShell("desktop");
+            waitForRendering(shell)
+            shell.usageScenario = "desktop"
+            waitForRendering(shell)
+            swipeAwayGreeter();
+
+            var app1SurfaceId = topLevelSurfaceList.nextId;
+            var app1 = ApplicationManager.startApplication("dialer-app")
+            waitUntilAppWindowIsFullyLoaded(app1SurfaceId);
+
+            var launcherDelegate1 = findChild(shell, "launcherDelegate1");
+            mouseClick(launcherDelegate1, launcherDelegate1.width / 2, launcherDelegate1.height / 2, Qt.RightButton);
+
+            var appDelegate = findChild(shell, "appDelegate_" + app1SurfaceId);
+            mouseMove(shell, appDelegate.mapToItem(shell, 0, 0).x, launcherDelegate1.mapToItem(shell, 0, 0).y);
+
+            expectFail("", "Cursor should not change while launcher menu is open");
+            tryCompare(Mir, "cursorName", "left_side");
+        }
+
         function test_panelTitleShowsWhenGreeterNotShown_data() {
             return [
                 {tag: "phone" },