1
=== modified file 'qml/Components/Dialogs.qml'
2
--- qml/Components/Dialogs.qml	2017-01-09 15:58:33 +0000
3
+++ qml/Components/Dialogs.qml	2017-01-09 15:58:33 +0000
4
@@ -149,6 +149,25 @@
5
149
        objectName: "dialogLoader"
149
        objectName: "dialogLoader"
6
150
        anchors.fill: parent
150
        anchors.fill: parent
7
151
        active: false
151
        active: false
8
152
        onActiveChanged: {
9
153
            if (!active) {
10
154
                if (previousFocusedItem) {
11
155
                    previousFocusedItem.forceActiveFocus(Qt.OtherFocusReason);
12
156
                    previousFocusedItem = undefined;
13
157
                }
14
158
                previousSourceComponent = undefined;
15
159
                sourceComponent = undefined;
16
160
            }
17
161
        }
18
162
        onSourceComponentChanged: {
19
163
            if (previousSourceComponent !== sourceComponent) {
20
164
                previousSourceComponent = sourceComponent;
21
165
                previousFocusedItem = window.activeFocusItem;
22
166
            }
23
167
        }
24
168
25
169
        property var previousSourceComponent: undefined
26
170
        property var previousFocusedItem: undefined
27
152
    }
171
    }
28
153
172
29
154
    Component {
173
    Component {
30
155
174
31
=== modified file 'tests/qmltests/tst_OrientedShell.qml'
32
--- tests/qmltests/tst_OrientedShell.qml	2017-01-09 15:58:33 +0000
33
+++ tests/qmltests/tst_OrientedShell.qml	2017-01-09 15:58:33 +0000
34
@@ -1596,5 +1596,40 @@
35
1596
1596
36
1597
            tryCompare(dialogLoader, "item", null);
1597
            tryCompare(dialogLoader, "item", null);
37
1598
        }
1598
        }
38
1599
39
1600
        function test_focusOnShutdownDialogClose() {
40
1601
            loadShell("manta");
41
1602
            usageModeSelector.selectWindowed();
42
1603
43
1604
            var surfaceId = topLevelSurfaceList.nextId;
44
1605
            var app = ApplicationManager.startApplication("twitter-webapp");
45
1606
            waitUntilAppWindowIsFullyLoaded(surfaceId);
46
1607
47
1608
            var primaryAppWindow = findAppWindowForSurfaceId(surfaceId);
48
1609
            var surface = app.surfaceList.get(0);
49
1610
            var surfaceItem = findSurfaceItem(primaryAppWindow, surface);
50
1611
51
1612
            compare(window.activeFocusItem, surfaceItem);
52
1613
53
1614
            testCase.showPowerDialog();
54
1615
55
1616
            var dialogLoader = findChild(orientedShell, "dialogLoader");
56
1617
            tryCompareFunction(function() { return dialogLoader.item !== null }, true);
57
1618
58
1619
            keyClick(Qt.Key_Escape);
59
1620
60
1621
            tryCompare(dialogLoader, "item", null);
61
1622
            compare(window.activeFocusItem, surfaceItem);
62
1623
63
1624
            // Do it twice, our previous solution failed the second time ^_^
64
1625
            testCase.showPowerDialog();
65
1626
66
1627
            tryCompareFunction(function() { return dialogLoader.item !== null }, true);
67
1628
68
1629
            keyClick(Qt.Key_Escape);
69
1630
70
1631
            tryCompare(dialogLoader, "item", null);
71
1632
            compare(window.activeFocusItem, surfaceItem);
72
1633
        }
73
1599
    }
1634
    }
74
1600
}
1635
}
Status:	Merged
Approved by:	Andrea Cimitan on 2017-01-10
Approved revision:	2685
Merged at revision:	2774
Proposed branch:	lp:~aacid/unity8/restoreFocusOnDialogClose
Merge into:	lp:unity8
Prerequisite:	lp:~lukas-kde/unity8/shellDialogImprovements
Diff against target:	74 lines (+54/-0) 2 files modified qml/Components/Dialogs.qml (+19/-0) tests/qmltests/tst_OrientedShell.qml (+35/-0)
To merge this branch:	bzr merge lp:~aacid/unity8/restoreFocusOnDialogClose
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Andrea Cimitan (community)		2017-01-05	Approve on 2017-01-10
Unity8 CI Bot	continuous-integration		Approve on 2017-01-10
Review via email: mp+314132@code.launchpad.net