1
=== modified file 'qml/Stages/ApplicationWindow.qml'
2
--- qml/Stages/ApplicationWindow.qml	2016-06-22 13:53:00 +0000
3
+++ qml/Stages/ApplicationWindow.qml	2016-08-08 13:43:26 +0000
4
@@ -27,6 +27,7 @@
5
27
    property alias interactive: surfaceContainer.interactive
27
    property alias interactive: surfaceContainer.interactive
6
28
    property bool orientationChangesEnabled: d.supportsSurfaceResize ? d.surfaceOldEnoughToBeResized : true
28
    property bool orientationChangesEnabled: d.supportsSurfaceResize ? d.surfaceOldEnoughToBeResized : true
7
29
    readonly property string title: surface && surface.name !== "" ? surface.name : d.name
29
    readonly property string title: surface && surface.name !== "" ? surface.name : d.name
8
30
    readonly property QtObject focusedSurface: d.focusedSurface.surface
9
30
31
10
31
    // overridable from outside
32
    // overridable from outside
11
32
    property bool fullscreen: {
33
    property bool fullscreen: {
12
33
34
13
=== modified file 'qml/Stages/DecoratedWindow.qml'
14
--- qml/Stages/DecoratedWindow.qml	2016-06-20 10:31:44 +0000
15
+++ qml/Stages/DecoratedWindow.qml	2016-08-08 13:43:26 +0000
16
@@ -26,6 +26,7 @@
17
26
26
18
27
    property alias application: applicationWindow.application
27
    property alias application: applicationWindow.application
19
28
    property alias surface: applicationWindow.surface
28
    property alias surface: applicationWindow.surface
20
29
    readonly property alias focusedSurface: applicationWindow.focusedSurface
21
29
    property alias active: decoration.active
30
    property alias active: decoration.active
22
30
    readonly property alias title: applicationWindow.title
31
    readonly property alias title: applicationWindow.title
23
31
    property alias fullscreen: applicationWindow.fullscreen
32
    property alias fullscreen: applicationWindow.fullscreen
24
32
33
25
=== modified file 'qml/Stages/DesktopStage.qml'
26
--- qml/Stages/DesktopStage.qml	2016-08-03 15:48:10 +0000
27
+++ qml/Stages/DesktopStage.qml	2016-08-08 13:43:26 +0000
28
@@ -230,7 +230,7 @@
29
230
    Binding {
230
    Binding {
30
231
        target: MirFocusController
231
        target: MirFocusController
31
232
        property: "focusedSurface"
232
        property: "focusedSurface"
33
233
        value: priv.focusedAppDelegate ? priv.focusedAppDelegate.surface : null
233
        value: priv.focusedAppDelegate ? priv.focusedAppDelegate.focusedSurface : null
34
234
        when: !appRepeater.startingUp && root.parent
234
        when: !appRepeater.startingUp && root.parent
35
235
    }
235
    }
36
236
236
37
@@ -334,6 +334,7 @@
38
334
334
39
335
                readonly property var surface: model.surface
335
                readonly property var surface: model.surface
40
336
                readonly property alias resizeArea: resizeArea
336
                readonly property alias resizeArea: resizeArea
41
337
                readonly property alias focusedSurface: decoratedWindow.focusedSurface
42
337
338
43
338
                readonly property bool isDash: model.application.appId == "unity8-dash"
339
                readonly property bool isDash: model.application.appId == "unity8-dash"
44
339
340
45
340
341
46
=== modified file 'qml/Stages/PhoneStage.qml'
47
--- qml/Stages/PhoneStage.qml	2016-06-02 13:11:54 +0000
48
+++ qml/Stages/PhoneStage.qml	2016-08-08 13:43:26 +0000
49
@@ -244,7 +244,7 @@
50
244
    Binding {
244
    Binding {
51
245
        target: MirFocusController
245
        target: MirFocusController
52
246
        property: "focusedSurface"
246
        property: "focusedSurface"
54
247
        value: priv.focusedAppDelegate ? priv.focusedAppDelegate.surface : null
247
        value: priv.focusedAppDelegate ? priv.focusedAppDelegate.focusedSurface : null
55
248
        when: root.parent && !spreadRepeater.startingUp
248
        when: root.parent && !spreadRepeater.startingUp
56
249
    }
249
    }
57
250
250
58
251
251
59
=== modified file 'qml/Stages/SpreadDelegate.qml'
60
--- qml/Stages/SpreadDelegate.qml	2016-06-22 20:19:55 +0000
61
+++ qml/Stages/SpreadDelegate.qml	2016-08-08 13:43:26 +0000
62
@@ -37,6 +37,7 @@
63
37
                                                      | Qt.LandscapeOrientation
37
                                                      | Qt.LandscapeOrientation
64
38
                                                      | Qt.InvertedPortraitOrientation
38
                                                      | Qt.InvertedPortraitOrientation
65
39
                                                      | Qt.InvertedLandscapeOrientation
39
                                                      | Qt.InvertedLandscapeOrientation
66
40
    readonly property alias focusedSurface: appWindow.focusedSurface
67
40
41
68
41
    // to be set from outside
42
    // to be set from outside
69
42
    property bool interactive: true
43
    property bool interactive: true
70
43
44
71
=== modified file 'qml/Stages/TabletStage.qml'
72
--- qml/Stages/TabletStage.qml	2016-07-12 09:43:50 +0000
73
+++ qml/Stages/TabletStage.qml	2016-08-08 13:43:26 +0000
74
@@ -307,7 +307,7 @@
75
307
    Binding {
307
    Binding {
76
308
        target: MirFocusController
308
        target: MirFocusController
77
309
        property: "focusedSurface"
309
        property: "focusedSurface"
79
310
        value: priv.focusedAppDelegate ? priv.focusedAppDelegate.surface : null
310
        value: priv.focusedAppDelegate ? priv.focusedAppDelegate.focusedSurface : null
80
311
        when: root.parent && !spreadRepeater.startingUp
311
        when: root.parent && !spreadRepeater.startingUp
81
312
    }
312
    }
82
313
313
83
314
314
84
=== modified file 'tests/qmltests/tst_Shell.qml'
85
--- tests/qmltests/tst_Shell.qml	2016-08-03 15:53:36 +0000
86
+++ tests/qmltests/tst_Shell.qml	2016-08-08 13:43:26 +0000
87
@@ -2429,6 +2429,15 @@
88
2429
            // verify the initial keymap of the newly started app is the first one from the list
2429
            // verify the initial keymap of the newly started app is the first one from the list
89
2430
            tryCompare(appSurface, "keymap", "sk");
2430
            tryCompare(appSurface, "keymap", "sk");
90
2431
2431
91
2432
            // try to create a prompt surface, verify it also has the same keymap
92
2433
            app.promptSurfaceList.createSurface();
93
2434
            var promptSurface = app.promptSurfaceList.get(0);
94
2435
            verify(promptSurface);
95
2436
            tryCompare(appSurface, "keymap", promptSurface.keymap);
96
2437
            // ... and that the controller's surface keymap is also the same
97
2438
            tryCompare(MirFocusController.focusedSurface, "keymap", "sk");
98
2439
            app.promptSurfaceList.get(0).close();
99
2440
100
2432
            // switch to next keymap, should go to "cz+qwerty"
2441
            // switch to next keymap, should go to "cz+qwerty"
101
2433
            keyClick(Qt.Key_Space, Qt.MetaModifier);
2442
            keyClick(Qt.Key_Space, Qt.MetaModifier);
102
2434
            tryCompare(appSurface, "keymap", "cz+qwerty");
2443
            tryCompare(appSurface, "keymap", "cz+qwerty");
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2016-08-08	Needs Fixing on 2016-08-10
Albert Astals Cid (community)		2016-08-08	Approve on 2016-08-08
Daniel d'Andrada		2016-08-08	Pending
Review via email: mp+302276@code.launchpad.net