1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2016-03-06 13:19:33 +0000
3
+++ CMakeLists.txt	2016-03-06 13:19:34 +0000
4
@@ -57,7 +57,7 @@
5
57
find_package(Qt5Concurrent 5.4 REQUIRED)
57
find_package(Qt5Concurrent 5.4 REQUIRED)
6
58
find_package(Qt5Sql 5.4 REQUIRED)
58
find_package(Qt5Sql 5.4 REQUIRED)
7
59
59
9
60
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=14)
60
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=15)
10
61
pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
61
pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
11
62
pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
62
pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
12
63
pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
63
pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
13
64
64
14
=== modified file 'data/com.canonical.Unity8.gschema.xml'
15
--- data/com.canonical.Unity8.gschema.xml	2016-03-06 13:19:33 +0000
16
+++ data/com.canonical.Unity8.gschema.xml	2016-03-06 13:19:34 +0000
17
@@ -28,7 +28,7 @@
18
28
      <description>How much you have to push (in grid units) the mouse against an edge barrier when sensibility is 1.</description>
28
      <description>How much you have to push (in grid units) the mouse against an edge barrier when sensibility is 1.</description>
19
29
    </key>
29
    </key>
20
30
    <key type="b" name="autohide-launcher">
30
    <key type="b" name="autohide-launcher">
22
31
      <default>false</default>
31
      <default>true</default>
23
32
      <summary>Autohide the launcher</summary>
32
      <summary>Autohide the launcher</summary>
24
33
      <description>This will only be applied in windowed mode. In staged mode, the launcher will always hide.</description>
33
      <description>This will only be applied in windowed mode. In staged mode, the launcher will always hide.</description>
25
34
    </key>
34
    </key>
26
35
35
27
=== modified file 'plugins/Unity/Launcher/launchermodel.cpp'
28
--- plugins/Unity/Launcher/launchermodel.cpp	2015-09-14 09:11:08 +0000
29
+++ plugins/Unity/Launcher/launchermodel.cpp	2016-03-06 13:19:34 +0000
30
@@ -214,7 +214,7 @@
31
214
            QDesktopServices::openUrl(getUrlForAppId(appId));
214
            QDesktopServices::openUrl(getUrlForAppId(appId));
32
215
        } else if (actionId == QLatin1String("stop_item")) { // Quit
215
        } else if (actionId == QLatin1String("stop_item")) { // Quit
33
216
            if (m_appManager) {
216
            if (m_appManager) {
35
217
                m_appManager->stopApplication(appId);
217
                m_appManager->requestStopApplication(appId);
36
218
            }
218
            }
37
219
        // Nope, we don't know this action, let the backend forward it to the application
219
        // Nope, we don't know this action, let the backend forward it to the application
38
220
        } else {
220
        } else {
39
221
221
40
=== modified file 'qml/Launcher/Launcher.qml'
41
--- qml/Launcher/Launcher.qml	2016-03-06 13:19:33 +0000
42
+++ qml/Launcher/Launcher.qml	2016-03-06 13:19:34 +0000
43
@@ -175,7 +175,7 @@
44
175
            event.accepted = true;
175
            event.accepted = true;
45
176
            break;
176
            break;
46
177
        case Qt.Key_Escape:
177
        case Qt.Key_Escape:
48
178
            panel.highlightIndex = -2
178
            panel.highlightIndex = -2;
49
179
            // Falling through intentionally
179
            // Falling through intentionally
50
180
        case Qt.Key_Enter:
180
        case Qt.Key_Enter:
51
181
        case Qt.Key_Return:
181
        case Qt.Key_Return:
52
@@ -186,6 +186,7 @@
53
186
                launcherApplicationSelected(LauncherModel.get(panel.highlightIndex).appId);
186
                launcherApplicationSelected(LauncherModel.get(panel.highlightIndex).appId);
54
187
            }
187
            }
55
188
            root.hide();
188
            root.hide();
56
189
            panel.highlightIndex = -2
57
189
            event.accepted = true;
190
            event.accepted = true;
58
190
            root.focus = false;
191
            root.focus = false;
59
191
        }
192
        }
60
@@ -355,7 +356,7 @@
61
355
            onTriggered: {
356
            onTriggered: {
62
356
                if (root.autohideEnabled && !root.lockedVisible) {
357
                if (root.autohideEnabled && !root.lockedVisible) {
63
357
                    if (!panel.preventHiding) {
358
                    if (!panel.preventHiding) {
65
358
                        root.hide();
359
                        root.state = ""
66
359
                    } else {
360
                    } else {
67
360
                        panel.dismissTimer.restart()
361
                        panel.dismissTimer.restart()
68
361
                    }
362
                    }
69
362
363
70
=== modified file 'qml/Stages/DesktopStage.qml'
71
--- qml/Stages/DesktopStage.qml	2016-03-06 13:19:33 +0000
72
+++ qml/Stages/DesktopStage.qml	2016-03-06 13:19:34 +0000
73
@@ -40,8 +40,6 @@
74
40
            ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
40
            ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
75
41
            : null
41
            : null
76
42
42
77
43
    mainAppWindow: priv.focusedAppDelegate ? priv.focusedAppDelegate.appWindow : null
78
44
79
45
    // application windows never rotate independently
43
    // application windows never rotate independently
80
46
    mainAppWindowOrientationAngle: shellOrientationAngle
44
    mainAppWindowOrientationAngle: shellOrientationAngle
81
47
45
82
@@ -62,20 +60,30 @@
83
62
        }
60
        }
84
63
61
85
64
        onFocusRequested: {
62
        onFocusRequested: {
89
65
            var appIndex = priv.indexOf(appId);
63
            var delegate = priv.appDelegate(appId);
90
66
            var appDelegate = appRepeater.itemAt(appIndex);
64
            if (delegate) {
91
67
            appDelegate.restore();
65
                delegate.restore();
92
66
            } else { // app died, start it
93
67
                ApplicationManager.startApplication(appId);
94
68
            }
95
68
69
96
69
            if (spread.state == "altTab") {
70
            if (spread.state == "altTab") {
97
70
                spread.cancel();
71
                spread.cancel();
98
71
            }
72
            }
99
72
        }
73
        }
100
74
101
75
        onStopRequested: {
102
76
            var delegate = priv.appDelegate(appId);
103
77
            if (delegate) {
104
78
                delegate.close();
105
79
            }
106
80
        }
107
73
    }
81
    }
108
74
82
109
75
    GlobalShortcut {
83
    GlobalShortcut {
110
76
        id: closeWindowShortcut
84
        id: closeWindowShortcut
111
77
        shortcut: Qt.AltModifier|Qt.Key_F4
85
        shortcut: Qt.AltModifier|Qt.Key_F4
113
78
        onTriggered: ApplicationManager.stopApplication(priv.focusedAppId)
86
        onTriggered: priv.focusedAppDelegate.close()
114
79
        active: priv.focusedAppId !== ""
87
        active: priv.focusedAppId !== ""
115
80
    }
88
    }
116
81
89
117
@@ -177,13 +185,18 @@
118
177
                }
185
                }
119
178
            }
186
            }
120
179
        }
187
        }
121
188
122
189
        function appDelegate(appId) {
123
190
            var appIndex = indexOf(appId);
124
191
            return appRepeater.itemAt(appIndex);
125
192
        }
126
180
    }
193
    }
127
181
194
128
182
    Connections {
195
    Connections {
129
183
        target: PanelState
196
        target: PanelState
133
184
        onClose: {
197
        onClose: if (priv.focusedAppDelegate) {
134
185
            ApplicationManager.stopApplication(ApplicationManager.focusedApplicationId)
198
                     priv.focusedAppDelegate.close()
135
186
        }
199
                 }
136
187
        onMinimize: priv.focusedAppDelegate && priv.focusedAppDelegate.minimize();
200
        onMinimize: priv.focusedAppDelegate && priv.focusedAppDelegate.minimize();
137
188
        onMaximize: priv.focusedAppDelegate // don't restore minimized apps when double clicking the panel
201
        onMaximize: priv.focusedAppDelegate // don't restore minimized apps when double clicking the panel
138
189
                    && priv.focusedAppDelegate.restoreFromMaximized();
202
                    && priv.focusedAppDelegate.restoreFromMaximized();
139
@@ -277,6 +290,7 @@
140
277
                readonly property alias maximizedLeft: appDelegatePrivate.maximizedLeft
290
                readonly property alias maximizedLeft: appDelegatePrivate.maximizedLeft
141
278
                readonly property alias maximizedRight: appDelegatePrivate.maximizedRight
291
                readonly property alias maximizedRight: appDelegatePrivate.maximizedRight
142
279
                readonly property alias minimized: appDelegatePrivate.minimized
292
                readonly property alias minimized: appDelegatePrivate.minimized
143
293
                readonly property alias fullscreen: decoratedWindow.fullscreen
144
280
294
145
281
                readonly property string appId: model.appId
295
                readonly property string appId: model.appId
146
282
                property bool animationsEnabled: true
296
                property bool animationsEnabled: true
147
@@ -354,6 +368,10 @@
148
354
                    ApplicationManager.focusApplication(appId);
368
                    ApplicationManager.focusApplication(appId);
149
355
                }
369
                }
150
356
370
151
371
                function close() {
152
372
                    state = "closing";
153
373
                }
154
374
155
357
                function playFocusAnimation() {
375
                function playFocusAnimation() {
156
358
                    focusAnimation.start()
376
                    focusAnimation.start()
157
359
                }
377
                }
158
@@ -369,6 +387,14 @@
159
369
387
160
370
                states: [
388
                states: [
161
371
                    State {
389
                    State {
162
390
                        name: "closing"
163
391
                        PropertyChanges { // freeze the values
164
392
                            target: appDelegate; explicit: true; restoreEntryValues: false;
165
393
                            x: appDelegate.x; y: appDelegate.y
166
394
                            requestedWidth: appDelegate.width; requestedHeight: appDelegate.height
167
395
                        }
168
396
                    },
169
397
                    State {
170
372
                        name: "fullscreen"; when: decoratedWindow.fullscreen
398
                        name: "fullscreen"; when: decoratedWindow.fullscreen
171
373
                        PropertyChanges {
399
                        PropertyChanges {
172
374
                            target: appDelegate;
400
                            target: appDelegate;
173
@@ -383,7 +409,8 @@
174
383
                        PropertyChanges {
409
                        PropertyChanges {
175
384
                            target: appDelegate;
410
                            target: appDelegate;
176
385
                            visuallyMinimized: false;
411
                            visuallyMinimized: false;
178
386
                            visuallyMaximized: false
412
                            visuallyMaximized: false;
179
413
                            opacity: 1; scale: 1
180
387
                        }
414
                        }
181
388
                    },
415
                    },
182
389
                    State {
416
                    State {
183
@@ -393,7 +420,8 @@
184
393
                            x: root.leftMargin; y: 0;
420
                            x: root.leftMargin; y: 0;
185
394
                            requestedWidth: appContainer.width - root.leftMargin; requestedHeight: appContainer.height;
421
                            requestedWidth: appContainer.width - root.leftMargin; requestedHeight: appContainer.height;
186
395
                            visuallyMinimized: false;
422
                            visuallyMinimized: false;
188
396
                            visuallyMaximized: true
423
                            visuallyMaximized: true;
189
424
                            opacity: 1; scale: 1
190
397
                        }
425
                        }
191
398
                    },
426
                    },
192
399
                    State {
427
                    State {
193
@@ -420,17 +448,32 @@
194
420
                ]
448
                ]
195
421
                transitions: [
449
                transitions: [
196
422
                    Transition {
450
                    Transition {
197
451
                        from: ",minimized"
198
423
                        to: "normal"
452
                        to: "normal"
199
424
                        enabled: appDelegate.animationsEnabled
453
                        enabled: appDelegate.animationsEnabled
200
425
                        PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
454
                        PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
202
426
                        UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: UbuntuAnimation.FastDuration }
455
                        UbuntuNumberAnimation { target: appDelegate; properties: "x,y" }
203
456
                        UbuntuNumberAnimation {
204
457
                            target: appDelegate
205
458
                            property: 'scale'
206
459
                            from: 0.85
207
460
                            to: 1
208
461
                            duration: UbuntuAnimation.SnapDuration
209
462
                        }
210
463
                        UbuntuNumberAnimation {
211
464
                            target: appDelegate
212
465
                            property: 'opacity'
213
466
                            from: 0
214
467
                            to: 1
215
468
                            duration: UbuntuAnimation.SnapDuration
216
469
                        }
217
427
                    },
470
                    },
218
428
                    Transition {
471
                    Transition {
219
429
                        to: "minimized"
472
                        to: "minimized"
220
430
                        enabled: appDelegate.animationsEnabled
473
                        enabled: appDelegate.animationsEnabled
221
431
                        PropertyAction { target: appDelegate; property: "visuallyMaximized" }
474
                        PropertyAction { target: appDelegate; property: "visuallyMaximized" }
222
432
                        SequentialAnimation {
475
                        SequentialAnimation {
224
433
                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: UbuntuAnimation.FastDuration }
476
                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,scale,requestedWidth,requestedHeight" }
225
434
                            PropertyAction { target: appDelegate; property: "visuallyMinimized" }
477
                            PropertyAction { target: appDelegate; property: "visuallyMinimized" }
226
435
                            ScriptAction {
478
                            ScriptAction {
227
436
                                script: {
479
                                script: {
228
@@ -442,11 +485,51 @@
229
442
                        }
485
                        }
230
443
                    },
486
                    },
231
444
                    Transition {
487
                    Transition {
232
488
                        to: "closing"
233
489
                        SequentialAnimation {
234
490
                            PropertyAction { target: appDelegate; properties: "x,y,requestedWidth,requestedHeight" }
235
491
                            ParallelAnimation {
236
492
                                UbuntuNumberAnimation {
237
493
                                    target: appDelegate
238
494
                                    property: 'scale'
239
495
                                    from: 1
240
496
                                    to: 0.85
241
497
                                    duration: UbuntuAnimation.SnapDuration
242
498
                                    easing: UbuntuAnimation.StandardEasingReverse
243
499
                                }
244
500
                                UbuntuNumberAnimation {
245
501
                                    target: appDelegate
246
502
                                    property: 'opacity'
247
503
                                    from: 1
248
504
                                    to: 0
249
505
                                    duration: UbuntuAnimation.SnapDuration
250
506
                                    easing: UbuntuAnimation.StandardEasingReverse
251
507
                                }
252
508
                            }
253
509
                            // hack: make sure the animation has really finished before closing the app
254
510
                            PauseAnimation { duration: UbuntuAnimation.SnapDuration }
255
511
                            ScriptAction {
256
512
                                script: {
257
513
                                    ApplicationManager.stopApplication(appId);
258
514
                                }
259
515
                            }
260
516
                        }
261
517
                    },
262
518
                    Transition {
263
519
                        from: "minimized"
264
520
                        to: "closing"
265
521
                        ScriptAction {
266
522
                            script: {
267
523
                                ApplicationManager.stopApplication(appId);
268
524
                            }
269
525
                        }
270
526
                    },
271
527
                    Transition {
272
445
                        to: "*" //maximized and fullscreen
528
                        to: "*" //maximized and fullscreen
273
446
                        enabled: appDelegate.animationsEnabled
529
                        enabled: appDelegate.animationsEnabled
274
447
                        PropertyAction { target: appDelegate; property: "visuallyMinimized" }
530
                        PropertyAction { target: appDelegate; property: "visuallyMinimized" }
275
448
                        SequentialAnimation {
531
                        SequentialAnimation {
277
449
                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: UbuntuAnimation.FastDuration }
532
                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,scale,requestedWidth,requestedHeight" }
278
450
                            PropertyAction { target: appDelegate; property: "visuallyMaximized" }
533
                            PropertyAction { target: appDelegate; property: "visuallyMaximized" }
279
451
                        }
534
                        }
280
452
                    }
535
                    }
281
@@ -483,7 +566,7 @@
282
483
                    active: ApplicationManager.focusedApplicationId === model.appId
566
                    active: ApplicationManager.focusedApplicationId === model.appId
283
484
                    focus: true
567
                    focus: true
284
485
568
286
486
                    onClose: ApplicationManager.stopApplication(model.appId)
569
                    onClose: appDelegate.close()
287
487
                    onMaximize: appDelegate.maximized || appDelegate.maximizedLeft || appDelegate.maximizedRight
570
                    onMaximize: appDelegate.maximized || appDelegate.maximizedLeft || appDelegate.maximizedRight
288
488
                                ? appDelegate.restoreFromMaximized() : appDelegate.maximize()
571
                                ? appDelegate.restoreFromMaximized() : appDelegate.maximize()
289
489
                    onMinimize: appDelegate.minimize()
572
                    onMinimize: appDelegate.minimize()
290
@@ -493,6 +576,27 @@
291
493
        }
576
        }
292
494
    }
577
    }
293
495
578
294
579
    BlurLayer {
295
580
        id: blurLayer
296
581
        anchors.fill: appContainer
297
582
        source: appContainer
298
583
        visible: false
299
584
    }
300
585
301
586
    Rectangle {
302
587
        id: spreadBackground
303
588
        anchors.fill: parent
304
589
        color: "#55000000"
305
590
        visible: false
306
591
    }
307
592
308
593
    MouseArea {
309
594
        id: eventEater
310
595
        anchors.fill: parent
311
596
        visible: spreadBackground.visible
312
597
        enabled: visible
313
598
    }
314
599
315
496
    EdgeBarrier {
600
    EdgeBarrier {
316
497
        id: edgeBarrier
601
        id: edgeBarrier
317
498
602
318
499
603
319
=== modified file 'qml/Stages/PhoneStage.qml'
320
--- qml/Stages/PhoneStage.qml	2016-03-06 13:19:33 +0000
321
+++ qml/Stages/PhoneStage.qml	2016-03-06 13:19:34 +0000
322
@@ -161,6 +161,10 @@
323
161
            }
161
            }
324
162
        }
162
        }
325
163
163
326
164
        onStopRequested: {
327
165
            applicationManager.stopApplication(appId);
328
166
        }
329
167
330
164
        function focusTopMostApp() {
168
        function focusTopMostApp() {
331
165
            if (applicationManager.count > 0) {
169
            if (applicationManager.count > 0) {
332
166
                var topmostApp = applicationManager.get(0);
170
                var topmostApp = applicationManager.get(0);
333
167
171
334
=== modified file 'qml/Stages/TabletStage.qml'
335
--- qml/Stages/TabletStage.qml	2016-03-06 13:19:33 +0000
336
+++ qml/Stages/TabletStage.qml	2016-03-06 13:19:34 +0000
337
@@ -228,6 +228,10 @@
338
228
                ApplicationManager.focusApplication(ApplicationManager.get(0).appId);
228
                ApplicationManager.focusApplication(ApplicationManager.get(0).appId);
339
229
            }
229
            }
340
230
        }
230
        }
341
231
342
232
        onStopRequested: {
343
233
            ApplicationManager.stopApplication(appId);
344
234
        }
345
231
    }
235
    }
346
232
236
347
233
    Flickable {
237
    Flickable {
348
234
238
349
=== modified file 'qml/Stages/WindowResizeArea.qml'
350
--- qml/Stages/WindowResizeArea.qml	2016-03-06 13:19:33 +0000
351
+++ qml/Stages/WindowResizeArea.qml	2016-03-06 13:19:34 +0000
352
@@ -73,10 +73,12 @@
353
73
        var windowGeometry = windowStateStorage.getGeometry(root.windowId,
73
        var windowGeometry = windowStateStorage.getGeometry(root.windowId,
354
74
                                                            Qt.rect(target.x, target.y, defaultWidth, defaultHeight));
74
                                                            Qt.rect(target.x, target.y, defaultWidth, defaultHeight));
355
75
75
360
76
        target.requestedWidth = Math.min(Math.max(windowGeometry.width, d.minimumWidth), screenWidth - root.leftMargin);
76
        target.requestedWidth = Qt.binding(function() { return Math.min(Math.max(windowGeometry.width, d.minimumWidth), screenWidth - root.leftMargin); });
361
77
        target.requestedHeight = Math.min(Math.max(windowGeometry.height, d.minimumHeight), root.screenHeight - PanelState.panelHeight);
77
        target.requestedHeight = Qt.binding(function() { return Math.min(Math.max(windowGeometry.height, d.minimumHeight),
362
78
        target.x = Math.max(Math.min(windowGeometry.x, root.screenWidth - root.leftMargin - target.requestedWidth), root.leftMargin)
78
                                                                         root.screenHeight - (target.fullscreen ? 0 : PanelState.panelHeight)); });
363
79
        target.y = Math.max(Math.min(windowGeometry.y, root.screenHeight - target.requestedHeight), PanelState.panelHeight)
79
        target.x = Qt.binding(function() { return Math.max(Math.min(windowGeometry.x, root.screenWidth - root.leftMargin - target.requestedWidth),
364
80
                                                           (target.fullscreen ? 0 : root.leftMargin)); });
365
81
        target.y = Qt.binding(function() { return Math.max(Math.min(windowGeometry.y, root.screenHeight - target.requestedHeight), PanelState.panelHeight); });
366
80
82
367
81
        var windowState = windowStateStorage.getState(root.windowId, WindowStateStorage.WindowStateNormal)
83
        var windowState = windowStateStorage.getState(root.windowId, WindowStateStorage.WindowStateNormal)
368
82
        if (windowState === WindowStateStorage.WindowStateMaximized) {
84
        if (windowState === WindowStateStorage.WindowStateMaximized) {
369
@@ -86,7 +88,7 @@
370
86
    }
88
    }
371
87
89
372
88
    Component.onDestruction: {
90
    Component.onDestruction: {
374
89
        windowStateStorage.saveState(root.windowId, target.state == "maximized" ? WindowStateStorage.WindowStateMaximized : WindowStateStorage.WindowStateNormal)
91
        windowStateStorage.saveState(root.windowId, target.maximized ? WindowStateStorage.WindowStateMaximized : WindowStateStorage.WindowStateNormal)
375
90
        windowStateStorage.saveGeometry(root.windowId, Qt.rect(priv.normalX, priv.normalY, priv.normalWidth, priv.normalHeight))
92
        windowStateStorage.saveGeometry(root.windowId, Qt.rect(priv.normalX, priv.normalY, priv.normalWidth, priv.normalHeight))
376
91
    }
93
    }
377
92
94
378
@@ -299,7 +301,7 @@
379
299
        }
301
        }
380
300
302
381
301
        if (d.topBorder) {
303
        if (d.topBorder) {
383
302
            var newTargetY = d.startY + deltaY;
304
            var newTargetY = Math.max(d.startY + deltaY, PanelState.panelHeight); // disallow resizing up past Panel
384
303
            var bottomBorderY = target.y + target.height;
305
            var bottomBorderY = target.y + target.height;
385
304
            if (bottomBorderY > newTargetY + d.minimumHeight) {
306
            if (bottomBorderY > newTargetY + d.minimumHeight) {
386
305
                if (bottomBorderY < newTargetY + d.maximumHeight) {
307
                if (bottomBorderY < newTargetY + d.maximumHeight) {
387
306
308
388
=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
389
--- tests/mocks/Unity/Application/ApplicationManager.cpp	2015-12-03 18:10:39 +0000
390
+++ tests/mocks/Unity/Application/ApplicationManager.cpp	2016-03-06 13:19:34 +0000
391
@@ -224,6 +224,12 @@
392
224
    return application;
224
    return application;
393
225
}
225
}
394
226
226
395
227
bool ApplicationManager::requestStopApplication(const QString &appId)
396
228
{
397
229
    QMetaObject::invokeMethod(this, "stopRequested", Qt::QueuedConnection, Q_ARG(QString, appId));
398
230
    return true;
399
231
}
400
232
401
227
ApplicationInfo* ApplicationManager::add(QString appId)
233
ApplicationInfo* ApplicationManager::add(QString appId)
402
228
{
234
{
403
229
    ApplicationInfo *application = 0;
235
    ApplicationInfo *application = 0;
404
230
236
405
=== modified file 'tests/mocks/Unity/Application/ApplicationManager.h'
406
--- tests/mocks/Unity/Application/ApplicationManager.h	2015-12-03 18:10:39 +0000
407
+++ tests/mocks/Unity/Application/ApplicationManager.h	2016-03-06 13:19:34 +0000
408
@@ -66,6 +66,7 @@
409
66
    Q_INVOKABLE void unfocusCurrentApplication() override;
66
    Q_INVOKABLE void unfocusCurrentApplication() override;
410
67
    Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;
67
    Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;
411
68
    Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, ExecFlags flags, const QStringList &arguments = QStringList());
68
    Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, ExecFlags flags, const QStringList &arguments = QStringList());
412
69
    Q_INVOKABLE bool requestStopApplication(const QString &appId) override;
413
69
    Q_INVOKABLE bool stopApplication(const QString &appId) override;
70
    Q_INVOKABLE bool stopApplication(const QString &appId) override;
414
70
71
415
71
    QString focusedApplicationId() const override;
72
    QString focusedApplicationId() const override;
416
@@ -79,7 +80,6 @@
417
79
    bool isEmpty() const;
80
    bool isEmpty() const;
418
80
81
419
81
 Q_SIGNALS:
82
 Q_SIGNALS:
420
82
    void focusRequested(const QString &appId);
421
83
    void emptyChanged(bool empty);
83
    void emptyChanged(bool empty);
422
84
    void availableApplicationsChanged(QStringList list);
84
    void availableApplicationsChanged(QStringList list);
423
85
85
424
86
86
425
=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
426
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2016-01-22 19:44:56 +0000
427
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2016-03-06 13:19:34 +0000
428
@@ -105,6 +105,10 @@
429
105
        }
105
        }
430
106
        return false;
106
        return false;
431
107
    }
107
    }
432
108
    bool requestStopApplication(const QString &appId) override {
433
109
        Q_EMIT stopRequested(appId);
434
110
        return stopApplication(appId);
435
111
    }
436
108
    bool focusApplication(const QString &appId) override {
112
    bool focusApplication(const QString &appId) override {
437
109
        Q_FOREACH(MockApp* app, m_list) {
113
        Q_FOREACH(MockApp* app, m_list) {
438
110
            app->setFocused(app->appId() == appId);
114
            app->setFocused(app->appId() == appId);
439
111
115
440
=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
441
--- tests/qmltests/Launcher/tst_Launcher.qml	2016-03-06 13:19:33 +0000
442
+++ tests/qmltests/Launcher/tst_Launcher.qml	2016-03-06 13:19:34 +0000
443
@@ -320,14 +320,21 @@
444
320
        }
320
        }
445
321
321
446
322
        function assertFocusOnIndex(index) {
322
        function assertFocusOnIndex(index) {
447
323
            var launcherPanel = findChild(launcher, "launcherPanel");
448
323
            var launcherListView = findChild(launcher, "launcherListView");
324
            var launcherListView = findChild(launcher, "launcherListView");
449
324
            var bfbFocusHighlight = findChild(launcher, "bfbFocusHighlight");
325
            var bfbFocusHighlight = findChild(launcher, "bfbFocusHighlight");
450
325
326
451
326
            waitForRendering(launcher);
327
            waitForRendering(launcher);
452
328
            tryCompare(launcherPanel, "highlightIndex", index);
453
327
            compare(bfbFocusHighlight.visible, index === -1);
329
            compare(bfbFocusHighlight.visible, index === -1);
454
328
            for (var i = 0; i < launcherListView.count; i++) {
330
            for (var i = 0; i < launcherListView.count; i++) {
457
329
                var focusRing = findChild(findChild(launcher, "launcherDelegate" + i), "focusRing")
331
                var item = findChild(launcher, "launcherDelegate" + i);
458
330
                compare(focusRing.visible, index === i);
332
                // Delegates might be destroyed when not visible. We can't check if they paint a focus highlight.
459
333
                // Make sure the requested index does have focus. for the others, try best effort to check if they don't
460
334
                if (index === i || item) {
461
335
                    var focusRing = findChild(item, "focusRing")
462
336
                    tryCompare(focusRing, "visible", index === i);
463
337
                }
464
331
            }
338
            }
465
332
        }
339
        }
466
333
340
467
@@ -1129,7 +1136,6 @@
468
1129
            var last = launcherListView.count - 1;
1136
            var last = launcherListView.count - 1;
469
1130
1137
470
1131
            compare(bfbFocusHighlight.visible, false);
1138
            compare(bfbFocusHighlight.visible, false);
471
1132
472
1133
            launcher.openForKeyboardNavigation();
1139
            launcher.openForKeyboardNavigation();
473
1134
            tryCompare(launcherPanel, "x", 0);
1140
            tryCompare(launcherPanel, "x", 0);
474
1135
            waitForRendering(launcher);
1141
            waitForRendering(launcher);
475
@@ -1154,6 +1160,7 @@
476
1154
1160
477
1155
            // The list should wrap around
1161
            // The list should wrap around
478
1156
            keyClick(Qt.Key_Up);
1162
            keyClick(Qt.Key_Up);
479
1163
            waitForRendering(launcher);
480
1157
            assertFocusOnIndex(last);
1164
            assertFocusOnIndex(last);
481
1158
1165
482
1159
            keyClick(Qt.Key_Down);
1166
            keyClick(Qt.Key_Down);
483
@@ -1186,6 +1193,9 @@
484
1186
            // Go bar to top by wrapping around
1193
            // Go bar to top by wrapping around
485
1187
            keyClick(Qt.Key_Down);
1194
            keyClick(Qt.Key_Down);
486
1188
            assertFocusOnIndex(1);
1195
            assertFocusOnIndex(1);
487
1196
488
1197
            keyClick(Qt.Key_Enter);
489
1198
            assertFocusOnIndex(-2);
490
1189
        }
1199
        }
491
1190
1200
492
1191
        function test_selectQuicklistItemByKeyboard() {
1201
        function test_selectQuicklistItemByKeyboard() {
493
1192
1202
494
=== modified file 'tests/qmltests/Stages/ApplicationCheckBox.qml'
495
--- tests/qmltests/Stages/ApplicationCheckBox.qml	2015-08-11 11:41:08 +0000
496
+++ tests/qmltests/Stages/ApplicationCheckBox.qml	2016-03-06 13:19:34 +0000
497
@@ -33,7 +33,7 @@
498
33
        if (checked) {
33
        if (checked) {
499
34
            ApplicationManager.startApplication(root.appId);
34
            ApplicationManager.startApplication(root.appId);
500
35
        } else {
35
        } else {
502
36
            ApplicationManager.stopApplication(root.appId);
36
            ApplicationManager.requestStopApplication(root.appId);
503
37
        }
37
        }
504
38
        d.bindGuard = false;
38
        d.bindGuard = false;
505
39
    }
39
    }
506
@@ -67,7 +67,7 @@
507
67
            if (checked) {
67
            if (checked) {
508
68
                ApplicationManager.startApplication(root.appId);
68
                ApplicationManager.startApplication(root.appId);
509
69
            } else {
69
            } else {
511
70
                ApplicationManager.stopApplication(root.appId);
70
                ApplicationManager.requestStopApplication(root.appId);
512
71
            }
71
            }
513
72
            d.bindGuard = false;
72
            d.bindGuard = false;
514
73
        }
73
        }
515
74
74
516
=== modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
517
--- tests/qmltests/Stages/tst_DesktopStage.qml	2016-03-06 13:19:33 +0000
518
+++ tests/qmltests/Stages/tst_DesktopStage.qml	2016-03-06 13:19:34 +0000
519
@@ -362,7 +362,7 @@
520
362
            verify(appDelegate);
362
            verify(appDelegate);
521
363
            ApplicationManager.focusApplication(appName);
363
            ApplicationManager.focusApplication(appName);
522
364
            keyClick(Qt.Key_F4, Qt.AltModifier); // Alt+F4 shortcut to close
364
            keyClick(Qt.Key_F4, Qt.AltModifier); // Alt+F4 shortcut to close
524
365
            verify(ApplicationManager.count == 2); // verify the app is gone
365
            tryCompare(ApplicationManager, "count", 2); // verify the app is gone
525
366
            verify(ApplicationManager.findApplication(appName) === null); // and it's not in running apps
366
            verify(ApplicationManager.findApplication(appName) === null); // and it's not in running apps
526
367
        }
367
        }
527
368
368
528
@@ -409,8 +409,8 @@
529
409
409
530
410
            // restore
410
            // restore
531
411
            dialerDelegate.restoreFromMaximized();
411
            dialerDelegate.restoreFromMaximized();
534
412
            compare(dashApp.session.lastSurface.visible, true);
412
            tryCompare(dashApp.session.lastSurface, "visible", true);
535
413
            compare(gmailApp.session.lastSurface.visible, true);
413
            tryCompare(gmailApp.session.lastSurface, "visible", true);
536
414
        }
414
        }
537
415
415
538
416
        function test_applicationsBecomeVisibleWhenOccludingAppRemoved() {
416
        function test_applicationsBecomeVisibleWhenOccludingAppRemoved() {
539
417
417
540
=== modified file 'tests/qmltests/Stages/tst_WindowResizeArea.qml'
541
--- tests/qmltests/Stages/tst_WindowResizeArea.qml	2015-11-30 18:25:47 +0000
542
+++ tests/qmltests/Stages/tst_WindowResizeArea.qml	2016-03-06 13:19:34 +0000
543
@@ -56,6 +56,7 @@
544
56
            property real widthIncrement: 0
56
            property real widthIncrement: 0
545
57
            property real heightIncrement: 0
57
            property real heightIncrement: 0
546
58
            state: "normal"
58
            state: "normal"
547
59
            readonly property bool maximized: state == "maximized"
548
59
60
549
60
            function maximize() {
61
            function maximize() {
550
61
                state = "maximized"
62
                state = "maximized"
Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)			Needs Fixing on 2016-02-22
PS Jenkins bot (community)	continuous-integration	2016-02-17	Needs Fixing on 2016-02-19
Unity8 CI Bot	continuous-integration	2016-02-17	Needs Fixing on 2016-02-19
Nick Dedekind		2016-02-17	Pending
Daniel d'Andrada		2016-02-17	Pending
Michael Terry		2016-02-17	Pending
Review via email: mp+286414@code.launchpad.net