1
=== modified file 'qml/Shell.qml'
2
--- qml/Shell.qml	2017-03-24 14:04:50 +0000
3
+++ qml/Shell.qml	2017-04-03 15:12:58 +0000
4
@@ -328,6 +328,7 @@
5
328
                panel.indicators.hide();
328
                panel.indicators.hide();
6
329
                panel.applicationMenus.hide();
329
                panel.applicationMenus.hide();
7
330
            }
330
            }
8
331
            onAltTabPressedChanged: if (altTabPressed) focus = true;
9
331
        }
332
        }
10
332
333
11
333
        TouchGestureArea {
334
        TouchGestureArea {
12
334
335
13
=== modified file 'tests/qmltests/tst_Shell.qml'
14
--- tests/qmltests/tst_Shell.qml	2017-03-24 11:08:11 +0000
15
+++ tests/qmltests/tst_Shell.qml	2017-04-03 15:12:58 +0000
16
@@ -3057,6 +3057,58 @@
17
3057
            tryCompare(topLevelSurfaceList.applicationAt(0), "appId", "dialer-app");
3057
            tryCompare(topLevelSurfaceList.applicationAt(0), "appId", "dialer-app");
18
3058
        }
3058
        }
19
3059
3059
20
3060
        function test_maximizedWindowMenuThenAltTab_data() {
21
3061
            return [
22
3062
                { tag: "show spread", showSpread: true },
23
3063
                { tag: "do not show spread", showSpread: false },
24
3064
            ];
25
3065
        }
26
3066
27
3067
        function test_maximizedWindowMenuThenAltTab(data) {
28
3068
            loadShell("desktop");
29
3069
            shell.usageScenario = "desktop";
30
3070
            waitForRendering(shell);
31
3071
            swipeAwayGreeter();
32
3072
33
3073
            var appDelegate = startApplication("gmail-webapp");
34
3074
            var appDelegate2 = startApplication("dialer-app");
35
3075
36
3076
            var maximizeButton = findChild(appDelegate2, "maximizeWindowButton");
37
3077
            mouseClick(maximizeButton);
38
3078
            tryCompare(appDelegate2, "state", "maximized");
39
3079
40
3080
            var panel = findChild(shell, "panel");
41
3081
            var panelMouse = findChild(panel, "windowControlArea");
42
3082
            mouseMove(panelMouse);
43
3083
            var panelMenu = findChild(panel, "menuBar");
44
3084
            var menuBarLoader = findChild(panel, "menuBarLoader");
45
3085
            mouseMove(panelMenu);
46
3086
            var panelMenuItem = findChild(panelMenu, "menuBar-item0");
47
3087
            tryCompare(panelMenuItem, "visible", true);
48
3088
            Util.waitForBehaviors(shell);
49
3089
            mouseClick(panelMenuItem);
50
3090
            var panelMenuItemItem = findChild(panelMenu, "menuBar-item0-menu-item0-actionItem");
51
3091
            mouseMove(panelMenuItemItem, panelMenuItemItem.width/2, panelMenuItemItem.height/2);
52
3092
            verify(panelMenuItemItem.activeFocus);
53
3093
            verify(panelMenuItem.__popup);
54
3094
55
3095
            keyPress(Qt.Key_Alt);
56
3096
            keyClick(Qt.Key_Tab);
57
3097
            if (data.showSpread) {
58
3098
                tryCompare(stage, "spreadShown", true);
59
3099
            }
60
3100
            tryCompareFunction(function() { return menuBarLoader.active === false; }, true);
61
3101
            keyRelease(Qt.Key_Alt)
62
3102
63
3103
            tryCompare(appDelegate.surface, "activeFocus", true);
64
3104
65
3105
            keyPress(Qt.Key_Alt);
66
3106
            keyClick(Qt.Key_Tab);
67
3107
            keyRelease(Qt.Key_Alt)
68
3108
69
3109
            tryCompare(appDelegate2.surface, "activeFocus", true);
70
3110
        }
71
3111
72
3060
        function test_touchMenuPosition_data() {
3112
        function test_touchMenuPosition_data() {
73
3061
            return [
3113
            return [
74
3062
                        { tag: "launcher locked", lockLauncher: true },
3114
                        { tag: "launcher locked", lockLauncher: true },
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2017-04-03	Approve on 2017-04-03
Daniel d'Andrada (community)		2017-04-03	Approve on 2017-04-03
Review via email: mp+321699@code.launchpad.net