1
=== modified file 'qml/Panel/Panel.qml'
2
--- qml/Panel/Panel.qml	2015-11-04 14:57:33 +0000
3
+++ qml/Panel/Panel.qml	2015-11-06 14:14:29 +0000
4
@@ -137,7 +137,7 @@
5
137
            }
137
            }
6
138
138
7
139
            shown: false
139
            shown: false
9
140
            width: root.width - (windowControlButtons.visible ? windowControlButtons.width : 0)
140
            width: root.width - (windowControlButtons.visible ? windowControlButtons.width + titleLabel.width : 0)
10
141
            minimizedPanelHeight: units.gu(3)
141
            minimizedPanelHeight: units.gu(3)
11
142
            expandedPanelHeight: units.gu(7)
142
            expandedPanelHeight: units.gu(7)
12
143
            openedHeight: root.height - indicatorOrangeLine.height
143
            openedHeight: root.height - indicatorOrangeLine.height
13
@@ -178,6 +178,23 @@
14
178
            onMaximize: PanelState.maximize()
178
            onMaximize: PanelState.maximize()
15
179
        }
179
        }
16
180
180
17
181
        Label {
18
182
            id: titleLabel
19
183
            objectName: "windowDecorationTitle"
20
184
            anchors {
21
185
                left: windowControlButtons.right
22
186
                top: parent.top
23
187
                margins: units.gu(0.7)
24
188
            }
25
189
            color: "#DFDBD2"
26
190
            height: windowControlButtons.height
27
191
            visible: windowControlButtons.visible
28
192
            verticalAlignment: Text.AlignVCenter
29
193
            fontSize: "small"
30
194
            font.bold: true
31
195
            text: PanelState.title
32
196
        }
33
197
34
181
        PanelSeparatorLine {
198
        PanelSeparatorLine {
35
182
            id: indicatorOrangeLine
199
            id: indicatorOrangeLine
36
183
            anchors {
200
            anchors {
37
184
201
38
=== modified file 'qml/Stages/DecoratedWindow.qml'
39
--- qml/Stages/DecoratedWindow.qml	2015-11-04 14:57:33 +0000
40
+++ qml/Stages/DecoratedWindow.qml	2015-11-06 14:14:29 +0000
41
@@ -26,6 +26,7 @@
42
26
    property alias window: applicationWindow
26
    property alias window: applicationWindow
43
27
    property alias application: applicationWindow.application
27
    property alias application: applicationWindow.application
44
28
    property alias active: decoration.active
28
    property alias active: decoration.active
45
29
    property alias title: decoration.title
46
29
30
47
30
    property bool decorationShown: true
31
    property bool decorationShown: true
48
31
    property bool highlightShown: false
32
    property bool highlightShown: false
49
@@ -66,7 +67,8 @@
50
66
        objectName: application ? "appWindowDecoration_" + application.appId : "appWindowDecoration_null"
67
        objectName: application ? "appWindowDecoration_" + application.appId : "appWindowDecoration_null"
51
67
        anchors { left: parent.left; top: parent.top; right: parent.right }
68
        anchors { left: parent.left; top: parent.top; right: parent.right }
52
68
        height: units.gu(3)
69
        height: units.gu(3)
54
69
        title: window.title !== "" ? window.title : model.name
70
        width: root.width
55
71
        title: window.title !== "" ? window.title : ""
56
70
        onClose: root.close();
72
        onClose: root.close();
57
71
        onMaximize: root.maximize();
73
        onMaximize: root.maximize();
58
72
        onMinimize: root.minimize();
74
        onMinimize: root.minimize();
59
73
75
60
=== modified file 'qml/Stages/DesktopSpread.qml'
61
--- qml/Stages/DesktopSpread.qml	2015-09-29 12:25:39 +0000
62
+++ qml/Stages/DesktopSpread.qml	2015-11-06 14:14:29 +0000
63
@@ -87,7 +87,7 @@
64
87
    function focusSelected() {
87
    function focusSelected() {
65
88
        if (spreadRepeater.highlightedIndex != -1) {
88
        if (spreadRepeater.highlightedIndex != -1) {
66
89
            var application = ApplicationManager.get(spreadRepeater.highlightedIndex);
89
            var application = ApplicationManager.get(spreadRepeater.highlightedIndex);
68
90
            ApplicationManager.focusApplication(application.appId);
90
            ApplicationManager.requestFocusApplication(application.appId);
69
91
        }
91
        }
70
92
    }
92
    }
71
93
93
72
94
94
73
=== modified file 'qml/Stages/DesktopSpreadDelegate.qml'
74
--- qml/Stages/DesktopSpreadDelegate.qml	2015-09-29 12:28:10 +0000
75
+++ qml/Stages/DesktopSpreadDelegate.qml	2015-11-06 14:14:29 +0000
76
@@ -29,8 +29,8 @@
77
29
    property bool highlightShown: false
29
    property bool highlightShown: false
78
30
    property real shadowOpacity: 1
30
    property real shadowOpacity: 1
79
31
31
82
32
    property int windowWidth: application.session && application.session.surface ? application.session.surface.size.width : 0
32
    property int windowWidth: application && application.session && application.session.surface ? application.session.surface.size.width : 0
83
33
    property int windowHeight: application.session && application.session.surface ? application.session.surface.size.height : 0
33
    property int windowHeight: application && application.session && application.session.surface ? application.session.surface.size.height : 0
84
34
34
85
35
    state: "normal"
35
    state: "normal"
86
36
    states: [
36
    states: [
87
37
37
88
=== modified file 'qml/Stages/DesktopStage.qml'
89
--- qml/Stages/DesktopStage.qml	2015-11-04 14:58:05 +0000
90
+++ qml/Stages/DesktopStage.qml	2015-11-06 14:14:29 +0000
91
@@ -20,11 +20,11 @@
92
20
import QtQuick.Layouts 1.1
20
import QtQuick.Layouts 1.1
93
21
import Ubuntu.Components 1.3
21
import Ubuntu.Components 1.3
94
22
import Unity.Application 0.1
22
import Unity.Application 0.1
95
23
import "../Components"
96
24
import "../Components/PanelState"
23
import "../Components/PanelState"
97
25
import "../Components"
24
import "../Components"
98
26
import Utils 0.1
25
import Utils 0.1
99
27
import Ubuntu.Gestures 0.1
26
import Ubuntu.Gestures 0.1
100
27
import GlobalShortcut 1.0
101
28
28
102
29
AbstractStage {
29
AbstractStage {
103
30
    id: root
30
    id: root
104
@@ -45,21 +45,72 @@
105
45
                spread.state = "";
45
                spread.state = "";
106
46
            }
46
            }
107
47
47
109
48
            ApplicationManager.requestFocusApplication(appId)
48
            ApplicationManager.focusApplication(appId);
110
49
        }
111
50
112
51
        onApplicationRemoved: {
113
52
            priv.focusNext();
114
49
        }
53
        }
115
50
54
116
51
        onFocusRequested: {
55
        onFocusRequested: {
117
52
            var appIndex = priv.indexOf(appId);
56
            var appIndex = priv.indexOf(appId);
118
53
            var appDelegate = appRepeater.itemAt(appIndex);
57
            var appDelegate = appRepeater.itemAt(appIndex);
121
54
            appDelegate.minimized = false;
58
            appDelegate.restoreFromMinimized();
120
55
            ApplicationManager.focusApplication(appId)
122
56
59
123
57
            if (spread.state == "altTab") {
60
            if (spread.state == "altTab") {
125
58
                spread.cancel()
61
                spread.cancel();
126
59
            }
62
            }
127
60
        }
63
        }
128
61
    }
64
    }
129
62
65
130
66
    GlobalShortcut {
131
67
        id: closeWindowShortcut
132
68
        shortcut: Qt.AltModifier|Qt.Key_F4
133
69
        onTriggered: ApplicationManager.stopApplication(priv.focusedAppId)
134
70
        active: priv.focusedAppId !== ""
135
71
    }
136
72
137
73
    GlobalShortcut {
138
74
        id: showSpreadShortcut
139
75
        shortcut: Qt.MetaModifier|Qt.Key_W
140
76
        onTriggered: spread.state = "altTab"
141
77
    }
142
78
143
79
    GlobalShortcut {
144
80
        id: minimizeAllShortcut
145
81
        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_D
146
82
        onTriggered: priv.minimizeAllWindows()
147
83
    }
148
84
149
85
    GlobalShortcut {
150
86
        id: maximizeWindowShortcut
151
87
        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Up
152
88
        onTriggered: priv.focusedAppDelegate.maximize()
153
89
        active: priv.focusedAppDelegate !== null
154
90
    }
155
91
156
92
    GlobalShortcut {
157
93
        id: maximizeWindowLeftShortcut
158
94
        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Left
159
95
        onTriggered: priv.focusedAppDelegate.maximizeLeft()
160
96
        active: priv.focusedAppDelegate !== null
161
97
    }
162
98
163
99
    GlobalShortcut {
164
100
        id: maximizeWindowRightShortcut
165
101
        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Right
166
102
        onTriggered: priv.focusedAppDelegate.maximizeRight()
167
103
        active: priv.focusedAppDelegate !== null
168
104
    }
169
105
170
106
    GlobalShortcut {
171
107
        id: minimizeRestoreShortcut
172
108
        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Down
173
109
        onTriggered: priv.focusedAppDelegate.maximized || priv.focusedAppDelegate.maximizedLeft || priv.focusedAppDelegate.maximizedRight
174
110
                     ? priv.focusedAppDelegate.restore() : priv.focusedAppDelegate.minimize(true)
175
111
        active: priv.focusedAppDelegate !== null
176
112
    }
177
113
178
63
    QtObject {
114
    QtObject {
179
64
        id: priv
115
        id: priv
180
65
116
181
@@ -93,6 +144,28 @@
182
93
            }
144
            }
183
94
            return -1;
145
            return -1;
184
95
        }
146
        }
185
147
186
148
        function minimizeAllWindows() {
187
149
            for (var i = 0; i < appRepeater.count; i++) {
188
150
                var appDelegate = appRepeater.itemAt(i);
189
151
                if (appDelegate && !appDelegate.minimized) {
190
152
                    appDelegate.minimize(false); // minimize but don't switch focus
191
153
                }
192
154
            }
193
155
194
156
            ApplicationManager.unfocusCurrentApplication(); // no app should have focus at this point
195
157
        }
196
158
197
159
        function focusNext() {
198
160
            ApplicationManager.unfocusCurrentApplication();
199
161
            for (var i = 0; i < appRepeater.count; i++) {
200
162
                var appDelegate = appRepeater.itemAt(i);
201
163
                if (appDelegate && !appDelegate.minimized) {
202
164
                    ApplicationManager.focusApplication(appDelegate.appId);
203
165
                    return;
204
166
                }
205
167
            }
206
168
        }
207
96
    }
169
    }
208
97
170
209
98
    Connections {
171
    Connections {
210
@@ -100,15 +173,23 @@
211
100
        onClose: {
173
        onClose: {
212
101
            ApplicationManager.stopApplication(ApplicationManager.focusedApplicationId)
174
            ApplicationManager.stopApplication(ApplicationManager.focusedApplicationId)
213
102
        }
175
        }
216
103
        onMinimize: appRepeater.itemAt(0).minimize();
176
        onMinimize: appRepeater.itemAt(0).minimize(true);
217
104
        onMaximize: appRepeater.itemAt(0).unmaximize();
177
        onMaximize: appRepeater.itemAt(0).restore();
218
105
    }
178
    }
219
106
179
220
107
    Binding {
180
    Binding {
221
108
        target: PanelState
181
        target: PanelState
222
109
        property: "buttonsVisible"
182
        property: "buttonsVisible"
225
110
        value: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.state === "maximized"
183
        value: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.maximized
226
111
    }
184
    }
227
185
228
186
    Binding {
229
187
        target: PanelState
230
188
        property: "title"
231
189
        value: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.title
232
190
        when: priv.focusedAppDelegate && priv.focusedAppDelegate.maximized
233
191
    }
234
192
235
112
    Component.onDestruction: PanelState.buttonsVisible = false;
193
    Component.onDestruction: PanelState.buttonsVisible = false;
236
113
194
237
114
    FocusScope {
195
    FocusScope {
238
@@ -135,23 +216,26 @@
239
135
216
240
136
            delegate: FocusScope {
217
            delegate: FocusScope {
241
137
                id: appDelegate
218
                id: appDelegate
243
138
                objectName: "stageDelegate_" + model.appId
219
                objectName: "appDelegate_" + appId
244
139
                z: ApplicationManager.count - index
220
                z: ApplicationManager.count - index
245
140
                y: units.gu(3)
221
                y: units.gu(3)
246
141
                width: units.gu(60)
222
                width: units.gu(60)
247
142
                height: units.gu(50)
223
                height: units.gu(50)
249
143
                focus: model.appId === priv.focusedAppId
224
                focus: appId === priv.focusedAppId
250
144
225
251
145
                property bool maximized: false
226
                property bool maximized: false
252
227
                property bool maximizedLeft: false
253
228
                property bool maximizedRight: false
254
146
                property bool minimized: false
229
                property bool minimized: false
255
230
                readonly property string appId: model.appId
256
147
                property bool animationsEnabled: true
231
                property bool animationsEnabled: true
258
148
232
                property alias title: decoratedWindow.title
259
149
                property bool visuallyMaximized: false
233
                property bool visuallyMaximized: false
260
150
                property bool visuallyMinimized: false
234
                property bool visuallyMinimized: false
261
151
235
262
152
                onFocusChanged: {
236
                onFocusChanged: {
265
153
                    if (focus && ApplicationManager.focusedApplicationId !== model.appId) {
237
                    if (focus && ApplicationManager.focusedApplicationId !== appId) {
266
154
                        ApplicationManager.focusApplication(model.appId);
238
                        ApplicationManager.focusApplication(appId);
267
155
                    }
239
                    }
268
156
                }
240
                }
269
157
241
270
@@ -163,8 +247,6 @@
271
163
                         (priv.foregroundMaximizedAppIdIndex === -1 || priv.foregroundMaximizedAppIdIndex >= index) ||
247
                         (priv.foregroundMaximizedAppIdIndex === -1 || priv.foregroundMaximizedAppIdIndex >= index) ||
272
164
                         (spread.state == "altTab" && index === spread.highlightedIndex)
248
                         (spread.state == "altTab" && index === spread.highlightedIndex)
273
165
249
274
166
                onVisibleChanged: console.log("VISIBLE", model.appId, visible)
275
167
276
168
                Binding {
250
                Binding {
277
169
                    target: ApplicationManager.get(index)
251
                    target: ApplicationManager.get(index)
278
170
                    property: "requestedState"
252
                    property: "requestedState"
279
@@ -180,22 +262,50 @@
280
180
                    animationsEnabled = (animated === undefined) || animated;
262
                    animationsEnabled = (animated === undefined) || animated;
281
181
                    minimized = false;
263
                    minimized = false;
282
182
                    maximized = true;
264
                    maximized = true;
283
265
                    maximizedLeft = false;
284
266
                    maximizedRight = false;
285
267
                }
286
268
                function maximizeLeft() {
287
269
                    minimized = false;
288
270
                    maximized = false;
289
271
                    maximizedLeft = true;
290
272
                    maximizedRight = false;
291
273
                }
292
274
                function maximizeRight() {
293
275
                    minimized = false;
294
276
                    maximized = false;
295
277
                    maximizedLeft = false;
296
278
                    maximizedRight = true;
297
183
                }
279
                }
298
184
                function minimize(animated) {
280
                function minimize(animated) {
299
185
                    animationsEnabled = (animated === undefined) || animated;
281
                    animationsEnabled = (animated === undefined) || animated;
300
186
                    maximized = false;
282
                    maximized = false;
301
187
                    minimized = true;
283
                    minimized = true;
302
188
                }
284
                }
304
189
                function unmaximize(animated) {
285
                function restore(animated) {
305
190
                    animationsEnabled = (animated === undefined) || animated;
286
                    animationsEnabled = (animated === undefined) || animated;
306
191
                    minimized = false;
287
                    minimized = false;
307
192
                    maximized = false;
288
                    maximized = false;
308
289
                    maximizedLeft = false;
309
290
                    maximizedRight = false;
310
291
                }
311
292
                function restoreFromMinimized(animated) {
312
293
                    animationsEnabled = (animated === undefined) || animated;
313
294
                    minimized = false;
314
295
                    if (maximized)
315
296
                        maximize();
316
297
                    else if (maximizedLeft)
317
298
                        maximizeLeft();
318
299
                    else if (maximizedRight)
319
300
                        maximizeRight();
320
301
                    ApplicationManager.focusApplication(appId);
321
193
                }
302
                }
322
194
303
323
195
                states: [
304
                states: [
324
196
                    State {
305
                    State {
325
197
                        name: "normal";
306
                        name: "normal";
326
198
                        when: !appDelegate.maximized && !appDelegate.minimized
307
                        when: !appDelegate.maximized && !appDelegate.minimized
327
308
                              && !appDelegate.maximizedLeft && !appDelegate.maximizedRight
328
199
                        PropertyChanges {
309
                        PropertyChanges {
329
200
                            target: appDelegate;
310
                            target: appDelegate;
330
201
                            visuallyMinimized: false;
311
                            visuallyMinimized: false;
331
@@ -213,6 +323,14 @@
332
213
                        }
323
                        }
333
214
                    },
324
                    },
334
215
                    State {
325
                    State {
335
326
                        name: "maximizedLeft"; when: appDelegate.maximizedLeft && !appDelegate.minimized
336
327
                        PropertyChanges { target: appDelegate; x: 0; y: units.gu(3); width: root.width/2; height: root.height - units.gu(3) }
337
328
                    },
338
329
                    State {
339
330
                        name: "maximizedRight"; when: appDelegate.maximizedRight && !appDelegate.minimized
340
331
                        PropertyChanges { target: appDelegate; x: root.width/2; y: units.gu(3); width: root.width/2; height: root.height - units.gu(3) }
341
332
                    },
342
333
                    State {
343
216
                        name: "minimized"; when: appDelegate.minimized
334
                        name: "minimized"; when: appDelegate.minimized
344
217
                        PropertyChanges {
335
                        PropertyChanges {
345
218
                            target: appDelegate;
336
                            target: appDelegate;
346
@@ -229,14 +347,14 @@
347
229
                        to: "normal"
347
                        to: "normal"
348
230
                        enabled: appDelegate.animationsEnabled
348
                        enabled: appDelegate.animationsEnabled
349
231
                        PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
349
                        PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
351
232
                        PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale,opacity" }
350
                        PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale" }
352
233
                    },
351
                    },
353
234
                    Transition {
352
                    Transition {
354
235
                        to: "maximized"
353
                        to: "maximized"
355
236
                        enabled: appDelegate.animationsEnabled
354
                        enabled: appDelegate.animationsEnabled
356
237
                        PropertyAction { target: appDelegate; property: "visuallyMinimized" }
355
                        PropertyAction { target: appDelegate; property: "visuallyMinimized" }
357
238
                        SequentialAnimation {
356
                        SequentialAnimation {
359
239
                            PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale,opacity" }
357
                            PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale" }
360
240
                            PropertyAction { target: appDelegate; property: "visuallyMaximized" }
358
                            PropertyAction { target: appDelegate; property: "visuallyMaximized" }
361
241
                        }
359
                        }
362
242
                    },
360
                    },
363
@@ -245,20 +363,15 @@
364
245
                        enabled: appDelegate.animationsEnabled
363
                        enabled: appDelegate.animationsEnabled
365
246
                        PropertyAction { target: appDelegate; property: "visuallyMaximized" }
364
                        PropertyAction { target: appDelegate; property: "visuallyMaximized" }
366
247
                        SequentialAnimation {
365
                        SequentialAnimation {
368
248
                            PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale,opacity" }
366
                            PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale" }
369
249
                            PropertyAction { target: appDelegate; property: "visuallyMinimized" }
367
                            PropertyAction { target: appDelegate; property: "visuallyMinimized" }
382
250
                        }
368
                            ScriptAction {
383
251
                    },
369
                                script: {
384
252
                    Transition {
370
                                    if (appDelegate.animationsEnabled && state === "minimized" ) {
385
253
                        from: ""
371
                                        priv.focusNext();
386
254
                        to: "altTab"
372
                                    }
387
255
                        PropertyAction { target: appDelegate; properties: "y,angle,z,itemScale,itemScaleOriginY" }
373
                                }
388
256
                        PropertyAction { target: decoratedWindow; properties: "anchors.topMargin" }
374
                            }
377
257
                        PropertyAnimation {
378
258
                            target: appDelegate; properties: "x"
379
259
                            from: root.width
380
260
                            duration: rightEdgePushArea.containsMouse ? UbuntuAnimation.FastDuration :0
381
261
                            easing: UbuntuAnimation.StandardEasing
389
262
                        }
375
                        }
390
263
                    }
376
                    }
391
264
                ]
377
                ]
392
@@ -294,8 +407,9 @@
393
294
                    focus: true
407
                    focus: true
394
295
408
395
296
                    onClose: ApplicationManager.stopApplication(model.appId)
409
                    onClose: ApplicationManager.stopApplication(model.appId)
398
297
                    onMaximize: appDelegate.maximized ? appDelegate.unmaximize() : appDelegate.maximize()
410
                    onMaximize: appDelegate.maximized || appDelegate.maximizedLeft || appDelegate.maximizedRight
399
298
                    onMinimize: appDelegate.minimize()
411
                                ? appDelegate.restore() : appDelegate.maximize()
400
412
                    onMinimize: appDelegate.minimize(true)
401
299
                    onDecorationPressed: { ApplicationManager.focusApplication(model.appId) }
413
                    onDecorationPressed: { ApplicationManager.focusApplication(model.appId) }
402
300
                }
414
                }
403
301
            }
415
            }
404
302
416
405
=== modified file 'qml/Stages/WindowDecoration.qml'
406
--- qml/Stages/WindowDecoration.qml	2015-11-04 14:57:33 +0000
407
+++ qml/Stages/WindowDecoration.qml	2015-11-06 14:14:29 +0000
408
@@ -45,14 +45,15 @@
409
45
            priv.distanceX = pos.x;
45
            priv.distanceX = pos.x;
410
46
            priv.distanceY = pos.y;
46
            priv.distanceY = pos.y;
411
47
            priv.dragging = true;
47
            priv.dragging = true;
412
48
            Mir.cursorName = "grabbing";
413
49
        } else {
48
        } else {
414
50
            priv.dragging = false;
49
            priv.dragging = false;
415
51
            Mir.cursorName = "";
50
            Mir.cursorName = "";
416
52
        }
51
        }
417
53
    }
52
    }
418
53
419
54
    onPositionChanged: {
54
    onPositionChanged: {
420
55
        if (priv.dragging) {
55
        if (priv.dragging) {
421
56
            Mir.cursorName = "grabbing";
422
56
            var pos = mapToItem(root.target.parent, mouseX, mouseY);
57
            var pos = mapToItem(root.target.parent, mouseX, mouseY);
423
57
            root.target.x = pos.x - priv.distanceX;
58
            root.target.x = pos.x - priv.distanceX;
424
58
            root.target.y = pos.y - priv.distanceY;
59
            root.target.y = pos.y - priv.distanceY;
425
@@ -70,11 +71,12 @@
426
70
    }
71
    }
427
71
72
428
72
    Row {
73
    Row {
430
73
        anchors { left: parent.left; top: parent.top; bottom: parent.bottom; margins: units.gu(0.7) }
74
        anchors { fill: parent; margins: units.gu(0.7) }
431
74
        spacing: units.gu(1)
75
        spacing: units.gu(1)
432
75
        opacity: root.active ? 1 : 0.5
76
        opacity: root.active ? 1 : 0.5
433
76
77
434
77
        WindowControlButtons {
78
        WindowControlButtons {
435
79
            id: buttons
436
78
            height: parent.height
80
            height: parent.height
437
79
            onClose: root.close();
81
            onClose: root.close();
438
80
            onMinimize: root.minimize();
82
            onMinimize: root.minimize();
439
@@ -86,9 +88,11 @@
440
86
            objectName: "windowDecorationTitle"
88
            objectName: "windowDecorationTitle"
441
87
            color: "#DFDBD2"
89
            color: "#DFDBD2"
442
88
            height: parent.height
90
            height: parent.height
443
91
            width: parent.width - buttons.width - parent.anchors.rightMargin - parent.anchors.leftMargin
444
89
            verticalAlignment: Text.AlignVCenter
92
            verticalAlignment: Text.AlignVCenter
445
90
            fontSize: "small"
93
            fontSize: "small"
446
91
            font.bold: true
94
            font.bold: true
447
95
            elide: Text.ElideRight
448
92
        }
96
        }
449
93
    }
97
    }
450
94
}
98
}
451
95
99
452
=== modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
453
--- tests/qmltests/Stages/tst_DesktopStage.qml	2015-11-04 14:58:05 +0000
454
+++ tests/qmltests/Stages/tst_DesktopStage.qml	2015-11-06 14:14:29 +0000
455
@@ -60,14 +60,10 @@
456
60
60
457
61
        focus: true
61
        focus: true
458
62
62
459
63
        property bool itemDestroyed: false
460
64
        sourceComponent: Component {
63
        sourceComponent: Component {
461
65
            DesktopStage {
64
            DesktopStage {
462
66
                color: "darkblue"
65
                color: "darkblue"
463
67
                anchors.fill: parent
66
                anchors.fill: parent
464
68
                Component.onDestruction: {
465
69
                    desktopStageLoader.itemDestroyed = true;
466
70
                }
467
71
                orientations: Orientations {}
67
                orientations: Orientations {}
468
72
            }
68
            }
469
73
        }
69
        }
470
@@ -103,16 +99,10 @@
471
103
        property Item desktopStage: desktopStageLoader.status === Loader.Ready ? desktopStageLoader.item : null
99
        property Item desktopStage: desktopStageLoader.status === Loader.Ready ? desktopStageLoader.item : null
472
104
100
473
105
        function cleanup() {
101
        function cleanup() {
474
106
            desktopStageLoader.itemDestroyed = false;
475
107
            desktopStageLoader.active = false;
102
            desktopStageLoader.active = false;
476
108
103
477
109
            tryCompare(desktopStageLoader, "status", Loader.Null);
104
            tryCompare(desktopStageLoader, "status", Loader.Null);
478
110
            tryCompare(desktopStageLoader, "item", null);
105
            tryCompare(desktopStageLoader, "item", null);
479
111
            // Loader.status might be Loader.Null and Loader.item might be null but the Loader
480
112
            // actually took place. Likely because Loader waits until the next event loop
481
113
            // iteration to do its work. So to ensure the reload, we will wait until the
482
114
            // Shell instance gets destroyed.
483
115
            tryCompare(desktopStageLoader, "itemDestroyed", true);
484
116
106
485
117
            killAllRunningApps();
107
            killAllRunningApps();
486
118
108
487
@@ -155,10 +145,7 @@
488
155
        }
145
        }
489
156
146
490
157
        function test_appFocusSwitch(data) {
147
        function test_appFocusSwitch(data) {
495
158
            var i;
148
            data.apps.forEach(startApplication);
492
159
            for (i = 0; i < data.apps.length; i++) {
493
160
                startApplication(data.apps[i]);
494
161
            }
496
162
149
497
163
            ApplicationManager.requestFocusApplication(data.apps[data.focusfrom]);
150
            ApplicationManager.requestFocusApplication(data.apps[data.focusfrom]);
498
164
            tryCompare(ApplicationManager.findApplication(data.apps[data.focusfrom]).session.surface, "activeFocus", true);
151
            tryCompare(ApplicationManager.findApplication(data.apps[data.focusfrom]).session.surface, "activeFocus", true);
499
@@ -175,10 +162,7 @@
500
175
        }
162
        }
501
176
163
502
177
        function test_tappingOnWindowChangesFocusedApp(data) {
164
        function test_tappingOnWindowChangesFocusedApp(data) {
507
178
            var i;
165
            data.apps.forEach(startApplication);
504
179
            for (i = 0; i < data.apps.length; i++) {
505
180
                startApplication(data.apps[i]);
506
181
            }
508
182
            var fromAppId = data.apps[data.focusfrom];
166
            var fromAppId = data.apps[data.focusfrom];
509
183
            var toAppId = data.apps[data.focusTo]
167
            var toAppId = data.apps[data.focusTo]
510
184
168
511
@@ -195,18 +179,37 @@
512
195
            compare(ApplicationManager.focusedApplicationId, toAppId);
179
            compare(ApplicationManager.focusedApplicationId, toAppId);
513
196
        }
180
        }
514
197
181
515
182
        function test_clickingOnWindowChangesFocusedApp_data() {
516
183
            return test_tappingOnWindowChangesFocusedApp_data(); // reuse test data
517
184
        }
518
185
519
186
        function test_clickingOnWindowChangesFocusedApp(data) {
520
187
            data.apps.forEach(startApplication);
521
188
            var fromAppId = data.apps[data.focusfrom];
522
189
            var toAppId = data.apps[data.focusTo]
523
190
524
191
            var fromAppWindow = findChild(desktopStage, "appWindow_" + fromAppId);
525
192
            verify(fromAppWindow);
526
193
            mouseClick(fromAppWindow);
527
194
            compare(fromAppWindow.application.session.surface.activeFocus, true);
528
195
            compare(ApplicationManager.focusedApplicationId, fromAppId);
529
196
530
197
            var toAppWindow = findChild(desktopStage, "appWindow_" + toAppId);
531
198
            verify(toAppWindow);
532
199
            mouseClick(toAppWindow);
533
200
            compare(toAppWindow.application.session.surface.activeFocus, true);
534
201
            compare(ApplicationManager.focusedApplicationId, toAppId);
535
202
        }
536
203
537
198
        function test_tappingOnDecorationFocusesApplication_data() {
204
        function test_tappingOnDecorationFocusesApplication_data() {
538
199
            return [
205
            return [
541
200
                {tag: "dash", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 0, focusTo: 1 },
206
                {tag: "dash to dialer", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 0, focusTo: 1 },
542
201
                {tag: "dash", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 1, focusTo: 0 },
207
                {tag: "dialer to dash", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 1, focusTo: 0 },
543
202
            ]
208
            ]
544
203
        }
209
        }
545
204
210
546
205
        function test_tappingOnDecorationFocusesApplication(data) {
211
        function test_tappingOnDecorationFocusesApplication(data) {
551
206
            var i;
212
            data.apps.forEach(startApplication);
548
207
            for (i = 0; i < data.apps.length; i++) {
549
208
                startApplication(data.apps[i]);
550
209
            }
552
210
213
553
211
            var fromAppDecoration = findChild(desktopStage, "appWindowDecoration_" + data.apps[data.focusfrom]);
214
            var fromAppDecoration = findChild(desktopStage, "appWindowDecoration_" + data.apps[data.focusfrom]);
554
212
            verify(fromAppDecoration);
215
            verify(fromAppDecoration);
555
@@ -219,10 +222,114 @@
556
219
            tryCompare(ApplicationManager.findApplication(data.apps[data.focusTo]).session.surface, "activeFocus", true);
222
            tryCompare(ApplicationManager.findApplication(data.apps[data.focusTo]).session.surface, "activeFocus", true);
557
220
        }
223
        }
558
221
224
559
225
        function test_clickingOnDecorationFocusesApplication_data() {
560
226
            return test_tappingOnDecorationFocusesApplication_data(); // reuse test data
561
227
        }
562
228
563
229
        function test_clickingOnDecorationFocusesApplication(data) {
564
230
            data.apps.forEach(startApplication);
565
231
566
232
            var fromAppDecoration = findChild(desktopStage, "appWindowDecoration_" + data.apps[data.focusfrom]);
567
233
            verify(fromAppDecoration);
568
234
            mouseClick(fromAppDecoration);
569
235
            tryCompare(ApplicationManager.findApplication(data.apps[data.focusfrom]).session.surface, "activeFocus", true);
570
236
571
237
            var toAppDecoration = findChild(desktopStage, "appWindowDecoration_" + data.apps[data.focusTo]);
572
238
            verify(toAppDecoration);
573
239
            mouseClick(toAppDecoration);
574
240
            tryCompare(ApplicationManager.findApplication(data.apps[data.focusTo]).session.surface, "activeFocus", true);
575
241
        }
576
242
577
243
        function test_windowMaximize() {
578
244
            var apps = ["unity8-dash", "dialer-app", "camera-app"];
579
245
            apps.forEach(startApplication);
580
246
            var appName = "dialer-app";
581
247
            var appDelegate = findChild(desktopStage, "appDelegate_" + appName);
582
248
            verify(appDelegate);
583
249
            ApplicationManager.focusApplication(appName);
584
250
            keyClick(Qt.Key_Up, Qt.MetaModifier|Qt.ControlModifier); // Ctrl+Super+Up shortcut to maximize
585
251
            tryCompare(appDelegate, "maximized", true);
586
252
            tryCompare(appDelegate, "minimized", false);
587
253
        }
588
254
589
255
        function test_windowMaximizeLeft() {
590
256
            var apps = ["unity8-dash", "dialer-app", "camera-app"];
591
257
            apps.forEach(startApplication);
592
258
            var appName = "dialer-app";
593
259
            var appDelegate = findChild(desktopStage, "appDelegate_" + appName);
594
260
            verify(appDelegate);
595
261
            ApplicationManager.focusApplication(appName);
596
262
            keyClick(Qt.Key_Left, Qt.MetaModifier|Qt.ControlModifier); // Ctrl+Super+Left shortcut to maximizeLeft
597
263
            tryCompare(appDelegate, "maximized", false);
598
264
            tryCompare(appDelegate, "minimized", false);
599
265
            tryCompare(appDelegate, "maximizedLeft", true);
600
266
            tryCompare(appDelegate, "maximizedRight", false);
601
267
        }
602
268
603
269
        function test_windowMaximizeRight() {
604
270
            var apps = ["unity8-dash", "dialer-app", "camera-app"];
605
271
            apps.forEach(startApplication);
606
272
            var appName = "dialer-app";
607
273
            var appDelegate = findChild(desktopStage, "appDelegate_" + appName);
608
274
            verify(appDelegate);
609
275
            ApplicationManager.focusApplication(appName);
610
276
            keyClick(Qt.Key_Right, Qt.MetaModifier|Qt.ControlModifier); // Ctrl+Super+Right shortcut to maximizeRight
611
277
            tryCompare(appDelegate, "maximized", false);
612
278
            tryCompare(appDelegate, "minimized", false);
613
279
            tryCompare(appDelegate, "maximizedLeft", false);
614
280
            tryCompare(appDelegate, "maximizedRight", true);
615
281
        }
616
282
617
283
        function test_windowMinimize() {
618
284
            var apps = ["unity8-dash", "dialer-app", "camera-app"];
619
285
            apps.forEach(startApplication);
620
286
            var appName = "dialer-app";
621
287
            var appDelegate = findChild(desktopStage, "appDelegate_" + appName);
622
288
            verify(appDelegate);
623
289
            ApplicationManager.focusApplication(appName);
624
290
            keyClick(Qt.Key_Down, Qt.MetaModifier|Qt.ControlModifier); // Ctrl+Super+Down shortcut to minimize
625
291
            tryCompare(appDelegate, "maximized", false);
626
292
            tryCompare(appDelegate, "minimized", true);
627
293
            verify(ApplicationManager.focusedApplicationId != ""); // verify we don't lose focus when minimizing an app
628
294
        }
629
295
630
296
        function test_windowMinimizeAll() {
631
297
            var apps = ["unity8-dash", "dialer-app", "camera-app"];
632
298
            apps.forEach(startApplication);
633
299
            verify(ApplicationManager.count == 3);
634
300
            keyClick(Qt.Key_D, Qt.MetaModifier|Qt.ControlModifier); // Ctrl+Super+D shortcut to minimize all
635
301
            tryCompare(ApplicationManager, "focusedApplicationId", ""); // verify no app is focused
636
302
        }
637
303
638
304
        function test_windowClose() {
639
305
            var apps = ["unity8-dash", "dialer-app", "camera-app"];
640
306
            apps.forEach(startApplication);
641
307
            verify(ApplicationManager.count == 3);
642
308
            var appName = "dialer-app";
643
309
            var appDelegate = findChild(desktopStage, "appDelegate_" + appName);
644
310
            verify(appDelegate);
645
311
            ApplicationManager.focusApplication(appName);
646
312
            keyClick(Qt.Key_F4, Qt.AltModifier); // Alt+F4 shortcut to close
647
313
            verify(ApplicationManager.count == 2); // verify the app is gone
648
314
            verify(ApplicationManager.findApplication(appName) === null); // and it's not in running apps
649
315
        }
650
316
651
317
        function test_smashCursorKeys() {
652
318
            var apps = ["unity8-dash", "dialer-app", "camera-app"];
653
319
            apps.forEach(startApplication);
654
320
            verify(ApplicationManager.count == 3);
655
321
            keyClick(Qt.Key_D, Qt.MetaModifier|Qt.ControlModifier); // Ctrl+Super+D shortcut to minimize all
656
322
            tryCompare(ApplicationManager, "focusedApplicationId", ""); // verify no app is focused
657
323
658
324
            // now try pressing all 4 arrow keys + ctrl + meta
659
325
            keyClick(Qt.Key_Up | Qt.Key_Down | Qt.Key_Left | Qt.Key_Right, Qt.MetaModifier|Qt.ControlModifier); // smash it!!!
660
326
            tryCompare(ApplicationManager, "focusedApplicationId", ""); // verify still no app is focused
661
327
        }
662
328
663
222
        function test_minimizeApplicationHidesSurface() {
329
        function test_minimizeApplicationHidesSurface() {
664
223
            var dashApp = startApplication("unity8-dash");
330
            var dashApp = startApplication("unity8-dash");
665
224
331
667
225
            var dashDelegate = findChild(desktopStage, "stageDelegate_unity8-dash");
332
            var dashDelegate = findChild(desktopStage, "appDelegate_unity8-dash");
668
226
            verify(dashDelegate);
333
            verify(dashDelegate);
669
227
334
670
228
            findChild(dashDelegate, "decoratedWindow").minimize();
335
            findChild(dashDelegate, "decoratedWindow").minimize();
671
@@ -234,11 +341,11 @@
672
234
            var dialerApp = startApplication("dialer-app");
341
            var dialerApp = startApplication("dialer-app");
673
235
            var cameraApp = startApplication("camera-app");
342
            var cameraApp = startApplication("camera-app");
674
236
343
676
237
            var dashDelegate = findChild(desktopStage, "stageDelegate_unity8-dash");
344
            var dashDelegate = findChild(desktopStage, "appDelegate_unity8-dash");
677
238
            verify(dashDelegate);
345
            verify(dashDelegate);
679
239
            var dialerDelegate = findChild(desktopStage, "stageDelegate_dialer-app");
346
            var dialerDelegate = findChild(desktopStage, "appDelegate_dialer-app");
680
240
            verify(dialerDelegate);
347
            verify(dialerDelegate);
682
241
            var cameraDelegate = findChild(desktopStage, "stageDelegate_camera-app");
348
            var cameraDelegate = findChild(desktopStage, "appDelegate_camera-app");
683
242
            verify(cameraDelegate);
349
            verify(cameraDelegate);
684
243
350
685
244
            // maximize
351
            // maximize
686
@@ -256,20 +363,20 @@
687
256
363
688
257
        function test_applicationsBecomeVisibleWhenOccludingAppRemoved() {
364
        function test_applicationsBecomeVisibleWhenOccludingAppRemoved() {
689
258
            var dashApp = startApplication("unity8-dash");
365
            var dashApp = startApplication("unity8-dash");
691
259
            var dashDelegate = findChild(desktopStage, "stageDelegate_unity8-dash");
366
            var dashDelegate = findChild(desktopStage, "appDelegate_unity8-dash");
692
260
            verify(dashDelegate);
367
            verify(dashDelegate);
693
261
368
694
262
            var dialerApp = startApplication("dialer-app");
369
            var dialerApp = startApplication("dialer-app");
696
263
            var dialerDelegate = findChild(desktopStage, "stageDelegate_dialer-app");
370
            var dialerDelegate = findChild(desktopStage, "appDelegate_dialer-app");
697
264
            verify(dialerDelegate);
371
            verify(dialerDelegate);
698
265
372
699
266
            var cameraApp = startApplication("camera-app");
373
            var cameraApp = startApplication("camera-app");
701
267
            var cameraDelegate = findChild(desktopStage, "stageDelegate_camera-app");
374
            var cameraDelegate = findChild(desktopStage, "appDelegate_camera-app");
702
268
            verify(cameraDelegate);
375
            verify(cameraDelegate);
703
269
            findChild(dialerDelegate, "decoratedWindow").maximize();
376
            findChild(dialerDelegate, "decoratedWindow").maximize();
704
270
377
705
271
            var galleryApp = startApplication("gallery-app");
378
            var galleryApp = startApplication("gallery-app");
707
272
            var galleryDelegate = findChild(desktopStage, "stageDelegate_gallery-app");
379
            var galleryDelegate = findChild(desktopStage, "appDelegate_gallery-app");
708
273
            verify(galleryDelegate);
380
            verify(galleryDelegate);
709
274
            findChild(galleryDelegate, "decoratedWindow").maximize();
381
            findChild(galleryDelegate, "decoratedWindow").maximize();
710
275
382
Status:	Merged
Approved by:	Albert Astals Cid on 2015-11-09
Approved revision:	2035
Merged at revision:	2046
Proposed branch:	lp:~lukas-kde/unity8/activateWindows
Merge into:	lp:unity8
Prerequisite:	lp:~mzanetti/unity8/panel-button-fixes
Diff against target:	709 lines (+317/-73) 7 files modified qml/Panel/Panel.qml (+18/-1) qml/Stages/DecoratedWindow.qml (+3/-1) qml/Stages/DesktopSpread.qml (+1/-1) qml/Stages/DesktopSpreadDelegate.qml (+2/-2) qml/Stages/DesktopStage.qml (+148/-34) qml/Stages/WindowDecoration.qml (+6/-2) tests/qmltests/Stages/tst_DesktopStage.qml (+139/-32)
To merge this branch:	bzr merge lp:~lukas-kde/unity8/activateWindows
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)			Abstain on 2015-11-09
PS Jenkins bot (community)	continuous-integration	2015-10-26	Needs Fixing on 2015-11-07
Michael Zanetti (community)		2015-10-26	Approve on 2015-11-03
Daniel d'Andrada		2015-10-26	Pending
Review via email: mp+275706@code.launchpad.net