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

[Albert Astals Cid]

Close top bar menu on alt+tab

Includes test that checks it works (and checks focus doesn't get lost in the middle of nowhere later)

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

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

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

"""
mouseClick(maximizeButton, maximizeButton.width / 2, maximizeButton.height / 2);
"""

Just mouseClick(maximizeButton) is enough. By default it clicks on the center of the given item.

[Daniel d'Andrada (dandrader)]

Still about the test:
- Can you click to show the menu instead of doing it programmatically?
- Shouldn't you check that the menu is no longer around while Alt is still pressed (and so the spread is still being shown)?

[Daniel d'Andrada (dandrader)]

review: Needs Information

[Albert Astals Cid (aacid)]

> Still about the test:
> - Can you click to show the menu instead of doing it programmatically?
Yep, done

> - Shouldn't you check that the menu is no longer around while Alt is still
> pressed (and so the spread is still being shown)?
Makes sense, done.

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

FAILED: Continuous integration, rev:2870
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3469/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4580
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2761
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2761
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4608
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4435
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4435/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4435
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4435/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4435
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4435/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4435
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4435/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4435
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4435/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4435
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4435/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:2870
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3473/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4585
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2765
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2765
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4613
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4439
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4439/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4439
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4439/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4439
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4439/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4439
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4439/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4439
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4439/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4439
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4439/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2871
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3471/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4583
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2769
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2769
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4611
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4438
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4438/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4438
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4438/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4438
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4438/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4438
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4438/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4438
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4438/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4438
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4438/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

Thanks

* 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:2873
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3511/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4643
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2807
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2807
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4671
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4498
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4498/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4498
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4498/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4498
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4498/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4498
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4498/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4498
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4498/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4498
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4498/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:2876
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3559/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4719
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2870
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2870/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4747
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4570
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4570/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4570
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4570/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4570
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4570/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4570
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4570/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4570
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4570/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4570
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4570/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:2876
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3561/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4722
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2872
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2872/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4750
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4573
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4573/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4573
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4573/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4573
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4573/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4573
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4573/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4573
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4573/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4573
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4573/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:2876
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3565/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4726
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2881
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2881
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4754
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4581
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4581/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4581
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4581/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4581
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4581/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4581
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4581/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4581
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4581/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4581
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4581/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~aacid/unity8/alt_tab_close_top_menu]

2877. By Albert Astals Cid on 2017-04-03

Merge lp:~lukas-kde/unity8/fix-window-title-vs-menu

2878. By Albert Astals Cid on 2017-04-03

Adapt to code changes, now it's mostly a test

2879. By Albert Astals Cid on 2017-04-03

mrege again

Unmerged revisions

2879. By Albert Astals Cid on 2017-04-03

mrege again

2878. By Albert Astals Cid on 2017-04-03

Adapt to code changes, now it's mostly a test

2877. By Albert Astals Cid on 2017-04-03

Merge lp:~lukas-kde/unity8/fix-window-title-vs-menu

2876. By Albert Astals Cid on 2017-03-24

try to find a non conflicting place ^_^

2875. By Albert Astals Cid on 2017-03-24

Merge

2874. By Albert Astals Cid on 2017-03-24

Need to wait a bit

2873. By Albert Astals Cid on 2017-03-24

whitespace

2872. By Albert Astals Cid on 2017-03-24

Merge

2871. By Albert Astals Cid on 2017-03-21

Move the check for no popup to before releasing alt

2870. By Albert Astals Cid on 2017-03-21

Use the mouse to show the menu

=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml	2017-03-21 10:55:52 +0000
+++ qml/Panel/Panel.qml	2017-04-03 13:39:39 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2016 Canonical, Ltd.
+ * Copyright (C) 2013-2017 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -85,15 +85,15 @@
         property bool showWindowDecorationControls: (revealControls && PanelState.decorationsVisible) ||
                                                     PanelState.decorationsAlwaysVisible
 
-        property bool showPointerMenu: revealControls &&
+        property bool showPointerMenu: revealControls && enablePointerMenu &&
                                        (PanelState.decorationsVisible || mode == "staged")
 
-        property bool enablePointerMenu: revealControls &&
-                                         applicationMenus.available &&
+        property bool enablePointerMenu: applicationMenus.available &&
                                          applicationMenus.model
 
         property bool showTouchMenu: !greeterShown &&
-                                     !showPointerMenu
+                                     !showPointerMenu &&
+                                     !showWindowDecorationControls
 
         property bool enableTouchMenus: showTouchMenu &&
                                         applicationMenus.available &&
@@ -211,7 +211,7 @@
                     opacity: d.showPointerMenu ? 1 : 0
                     visible: opacity != 0
                     Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
-                    active: __applicationMenus.model && !callHint.visible
+                    active: d.showPointerMenu && !callHint.visible
 
                     width: parent.width - windowControlButtons.width - units.gu(2) - __indicators.barWidth
 
@@ -220,7 +220,7 @@
                     sourceComponent: MenuBar {
                         id: bar
                         objectName: "menuBar"
-                        anchors.left: parent.left
+                        anchors.left: parent ? parent.left : undefined
                         anchors.margins: units.gu(1)
                         height: menuBarLoader.height
                         enableKeyFilter: valid && PanelState.decorationsVisible
@@ -339,7 +339,7 @@
             maximumLineCount: 1
             fontSize: "medium"
             font.weight: Font.Medium
-            color: Theme.palette.selected.backgroundText
+            color: theme.palette.selected.backgroundText
             opacity: __applicationMenus.visible && !__applicationMenus.expanded ? 1 : 0
             visible: opacity != 0
             Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.SnapDuration } }

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2017-03-24 14:04:50 +0000
+++ qml/Shell.qml	2017-04-03 13:39:39 +0000
@@ -328,6 +328,7 @@
                 panel.indicators.hide();
                 panel.applicationMenus.hide();
             }
+            onAltTabPressedChanged: if (altTabPressed) focus = true;
         }
 
         TouchGestureArea {

=== modified file 'qml/Stage/DecoratedWindow.qml'
--- qml/Stage/DecoratedWindow.qml	2017-03-24 14:04:50 +0000
+++ qml/Stage/DecoratedWindow.qml	2017-04-03 13:39:39 +0000
@@ -38,6 +38,7 @@
     property alias maximizeButtonShown: decoration.maximizeButtonShown
     property alias interactive: applicationWindow.interactive
     readonly property alias orientationChangesEnabled: applicationWindow.orientationChangesEnabled
+    property alias windowControlButtonsVisible: decoration.windowControlButtonsVisible
 
     // Changing this will actually add/remove a decoration, meaning, requestedHeight will take the decoration into account.
     property bool hasDecoration: true

=== modified file 'qml/Stage/Stage.qml'
--- qml/Stage/Stage.qml	2017-03-28 21:46:37 +0000
+++ qml/Stage/Stage.qml	2017-04-03 13:39:39 +0000
@@ -390,7 +390,7 @@
     Binding {
         target: PanelState
         property: "decorationsVisible"
-        value: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.maximized // FIXME for Locally integrated menus
+        value: mode == "windowed" && priv.focusedAppDelegate && priv.focusedAppDelegate.maximized && !root.spreadShown
     }
 
     Binding {
@@ -1385,6 +1385,7 @@
                             requestedHeight: appContainer.height;
                         }
                         PropertyChanges { target: touchControls; enabled: true }
+                        PropertyChanges { target: decoratedWindow; windowControlButtonsVisible: false }
                     },
                     State {
                         name: "fullscreen"; when: appDelegate.fullscreen && !appDelegate.minimized

=== modified file 'qml/Stage/WindowDecoration.qml'
--- qml/Stage/WindowDecoration.qml	2017-03-01 12:18:59 +0000
+++ qml/Stage/WindowDecoration.qml	2017-04-03 13:39:39 +0000
@@ -34,6 +34,7 @@
     property var menu: undefined
     property bool enableMenus: true
     property bool windowMoving: false
+    property alias windowControlButtonsVisible: buttons.visible
 
     readonly property real buttonsWidth: buttons.width + row.spacing
 

=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
--- tests/qmltests/Panel/tst_Panel.qml	2017-03-17 13:44:30 +0000
+++ tests/qmltests/Panel/tst_Panel.qml	2017-04-03 13:39:39 +0000
@@ -779,40 +779,18 @@
 
             var appTitle = findChild(panel, "panelTitle"); verify(appTitle);
             var appMenuRow = findChild(panel.applicationMenus, "panelRow"); verify(appMenuRow);
-            var appMenuBar = findChild(panel, "menuBar"); verify(appMenuBar);
+            var menuBarLoader = findChild(panel, "menuBarLoader"); verify(menuBarLoader);
 
             tryCompare(appTitle, "visible", true, undefined, "App title should be visible");
-            tryCompare(appMenuBar, "visible", false, undefined, "App menu bar should not be visible");
+            tryCompare(menuBarLoader, "visible", false, undefined, "App menu bar should not be visible");
 
             mouseMove(panel, panel.width/2, panel.panelHeight);
 
+            var appMenuBar = findChild(panel, "menuBar"); verify(appMenuBar);
             tryCompare(appTitle, "visible", false, undefined, "App title should not be visible on mouse hover");
             tryCompare(appMenuBar, "visible", true, undefined, "App menu bar should be visible on mouse hover");
         }
 
-        function test_windowedApplicationMenuShowOnMouseHoverWhenDecorationsShown() {
-            PanelState.title = "Fake Title";
-            panel.mode = "windowed";
-            mouseEmulation.checked = false;
-
-            var appTitle = findChild(panel, "panelTitle"); verify(appTitle);
-            var appMenuRow = findChild(panel.applicationMenus, "panelRow"); verify(appMenuRow);
-            var appMenuBar = findChild(panel, "menuBar"); verify(appMenuBar);
-
-            tryCompare(appTitle, "visible", true, undefined, "App title should be visible");
-            tryCompare(appMenuBar, "visible", false, undefined, "App menu bar should not be visible");
-
-            mouseMove(panel, panel.width/2, panel.panelHeight);
-
-            tryCompare(appTitle, "visible", true, undefined, "App title should still be visible on mouse hover when panel decorations are not visible");
-            tryCompare(appMenuBar, "visible", false, undefined, "App menu bar should be visible on mouse hover when panel decorations are not visible");
-
-            PanelState.decorationsVisible = true;
-
-            tryCompare(appTitle, "visible", false, undefined, "App title should still be visible on mouse hover when panel decorations are visible");
-            tryCompare(appMenuBar, "visible", true, undefined, "App menu bar should be visible on mouse hover when panel decorations not visible");
-        }
-
         function test_keyboardNavigation_data() {
             return [
                 {tag: "tab to start", doTab: false},

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2017-03-24 11:08:11 +0000
+++ tests/qmltests/tst_Shell.qml	2017-04-03 13:39:39 +0000
@@ -3057,6 +3057,58 @@
             tryCompare(topLevelSurfaceList.applicationAt(0), "appId", "dialer-app");
         }
 
+        function test_maximizedWindowMenuThenAltTab_data() {
+            return [
+                { tag: "show spread", showSpread: true },
+                { tag: "do not show spread", showSpread: false },
+            ];
+        }
+
+        function test_maximizedWindowMenuThenAltTab(data) {
+            loadShell("desktop");
+            shell.usageScenario = "desktop";
+            waitForRendering(shell);
+            swipeAwayGreeter();
+
+            var appDelegate = startApplication("gmail-webapp");
+            var appDelegate2 = startApplication("dialer-app");
+
+            var maximizeButton = findChild(appDelegate2, "maximizeWindowButton");
+            mouseClick(maximizeButton);
+            tryCompare(appDelegate2, "state", "maximized");
+
+            var panel = findChild(shell, "panel");
+            var panelMouse = findChild(panel, "windowControlArea");
+            mouseMove(panelMouse);
+            var panelMenu = findChild(panel, "menuBar");
+            var menuBarLoader = findChild(panel, "menuBarLoader");
+            mouseMove(panelMenu);
+            var panelMenuItem = findChild(panelMenu, "menuBar-item0");
+            tryCompare(panelMenuItem, "visible", true);
+            Util.waitForBehaviors(shell);
+            mouseClick(panelMenuItem);
+            var panelMenuItemItem = findChild(panelMenu, "menuBar-item0-menu-item0-actionItem");
+            mouseMove(panelMenuItemItem, panelMenuItemItem.width/2, panelMenuItemItem.height/2);
+            verify(panelMenuItemItem.activeFocus);
+            verify(panelMenuItem.__popup);
+
+            keyPress(Qt.Key_Alt);
+            keyClick(Qt.Key_Tab);
+            if (data.showSpread) {
+                tryCompare(stage, "spreadShown", true);
+            }
+            tryCompareFunction(function() { return menuBarLoader.active === false; }, true);
+            keyRelease(Qt.Key_Alt)
+
+            tryCompare(appDelegate.surface, "activeFocus", true);
+
+            keyPress(Qt.Key_Alt);
+            keyClick(Qt.Key_Tab);
+            keyRelease(Qt.Key_Alt)
+
+            tryCompare(appDelegate2.surface, "activeFocus", true);
+        }
+
         function test_touchMenuPosition_data() {
             return [
                         { tag: "launcher locked", lockLauncher: true },