1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2017-01-10 14:46:09 +0000
3
+++ CMakeLists.txt	2017-01-19 15:00:39 +0000
4
@@ -70,7 +70,7 @@
5
70
find_package(Qt5Concurrent 5.6 REQUIRED)
70
find_package(Qt5Concurrent 5.6 REQUIRED)
6
71
find_package(Qt5Sql 5.6 REQUIRED)
71
find_package(Qt5Sql 5.6 REQUIRED)
7
72
72
9
73
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=23)
73
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=24)
10
74
pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
74
pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
11
75
pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
75
pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
12
76
pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
76
pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
13
77
77
14
=== modified file 'plugins/WindowManager/TopLevelWindowModel.cpp'
15
--- plugins/WindowManager/TopLevelWindowModel.cpp	2016-12-06 14:42:26 +0000
16
+++ plugins/WindowManager/TopLevelWindowModel.cpp	2017-01-19 15:00:39 +0000
17
@@ -176,18 +176,13 @@
18
176
        // No point in signaling anything if we're resetting the whole model
176
        // No point in signaling anything if we're resetting the whole model
19
177
    }
177
    }
20
178
178
26
179
    int id = generateId();
179
    Window *window = createWindow(surface);
27
180
    Window *window = new Window(id, this);
180
23
181
    if (surface) {
24
182
        window->setSurface(surface);
25
183
    }
28
184
    m_windowModel.prepend(ModelEntry(window, application));
181
    m_windowModel.prepend(ModelEntry(window, application));
29
185
    if (surface) {
182
    if (surface) {
30
186
        connectSurface(surface);
183
        connectSurface(surface);
31
187
    }
184
    }
32
188
185
33
189
    connectWindow(window);
34
190
35
191
    if (m_modelState == InsertingState) {
186
    if (m_modelState == InsertingState) {
36
192
        endInsertRows();
187
        endInsertRows();
37
193
        Q_EMIT countChanged();
188
        Q_EMIT countChanged();
38
@@ -322,34 +317,47 @@
39
322
    }
317
    }
40
323
}
318
}
41
324
319
42
320
Window *TopLevelWindowModel::createWindow(unityapi::MirSurfaceInterface *surface)
43
321
{
44
322
    int id = generateId();
45
323
    Window *qmlWindow = new Window(id, this);
46
324
    connectWindow(qmlWindow);
47
325
    if (surface) {
48
326
        qmlWindow->setSurface(surface);
49
327
    }
50
328
    return qmlWindow;
51
329
}
52
330
53
325
void TopLevelWindowModel::onSurfaceCreated(unityapi::MirSurfaceInterface *surface)
331
void TopLevelWindowModel::onSurfaceCreated(unityapi::MirSurfaceInterface *surface)
54
326
{
332
{
55
327
    DEBUG_MSG << "(" << surface << ")";
333
    DEBUG_MSG << "(" << surface << ")";
62
328
    if (surface->type() == Mir::InputMethodType) {
334
63
329
        int id = generateId();
335
    if (surface->parentSurface()) {
64
330
        Window *qmlWindow = new Window(id, this);
336
        // Wrap it in a Window so that we keep focusedWindow() up to date.
65
331
        connectWindow(qmlWindow);
337
        Window *window = createWindow(surface);
66
332
        qmlWindow->setSurface(surface);
338
        connect(surface, &QObject::destroyed, window, [=](){
67
333
        setInputMethodWindow(qmlWindow);
339
            window->setSurface(nullptr);
68
340
            window->deleteLater();
69
341
        });
70
334
    } else {
342
    } else {
74
335
        auto application = m_applicationManager->findApplicationWithSurface(surface);
343
        if (surface->type() == Mir::InputMethodType) {
75
336
        if (application) {
344
            setInputMethodWindow(createWindow(surface));
73
337
            prependSurface(surface, application);
76
338
        } else {
345
        } else {
88
339
            // Must be a prompt session. No need to do add it as a prompt surface is not top-level.
346
            auto *application = m_applicationManager->findApplicationWithSurface(surface);
89
340
            // It will show up in the ApplicationInfoInterface::promptSurfaceList of some application.
347
            if (application) {
90
341
            // Still wrap it in a Window though, so that we keep focusedWindow() up to date.
348
                prependSurface(surface, application);
91
342
            int id = generateId();
349
            } else {
92
343
            Window *promptWindow = new Window(id, this);
350
                // Must be a prompt session. No need to do add it as a prompt surface is not top-level.
93
344
            connectWindow(promptWindow);
351
                // It will show up in the ApplicationInfoInterface::promptSurfaceList of some application.
94
345
            promptWindow->setSurface(surface);
352
                // Still wrap it in a Window though, so that we keep focusedWindow() up to date.
95
346
            connect(surface, &QObject::destroyed, promptWindow, [=](){
353
                Window *promptWindow = createWindow(surface);
96
347
                promptWindow->setSurface(nullptr);
354
                connect(surface, &QObject::destroyed, promptWindow, [=](){
97
348
                promptWindow->deleteLater();
355
                    promptWindow->setSurface(nullptr);
98
349
            });
356
                    promptWindow->deleteLater();
99
357
                });
100
358
            }
101
350
        }
359
        }
102
351
    }
360
    }
103
352
    // TODO: handle surfaces that are neither top-level windows nor input method. eg: child dialogs, popups, menus
104
353
}
361
}
105
354
362
106
355
void TopLevelWindowModel::removeAt(int index)
363
void TopLevelWindowModel::removeAt(int index)
107
356
364
108
=== modified file 'plugins/WindowManager/TopLevelWindowModel.h'
109
--- plugins/WindowManager/TopLevelWindowModel.h	2016-12-06 14:42:26 +0000
110
+++ plugins/WindowManager/TopLevelWindowModel.h	2017-01-19 15:00:39 +0000
111
@@ -220,6 +220,8 @@
112
220
220
113
221
    void activateTopMostWindowWithoutId(int forbiddenId);
221
    void activateTopMostWindowWithoutId(int forbiddenId);
114
222
222
115
223
    Window *createWindow(unity::shell::application::MirSurfaceInterface *surface);
116
224
117
223
    struct ModelEntry {
225
    struct ModelEntry {
118
224
        ModelEntry() {}
226
        ModelEntry() {}
119
225
        ModelEntry(Window *window,
227
        ModelEntry(Window *window,
120
226
228
121
=== modified file 'plugins/WindowManager/Window.h'
122
--- plugins/WindowManager/Window.h	2016-11-30 19:24:02 +0000
123
+++ plugins/WindowManager/Window.h	2017-01-19 15:00:39 +0000
124
@@ -32,7 +32,6 @@
125
32
    }
32
    }
126
33
}
33
}
127
34
34
128
35
129
36
Q_DECLARE_LOGGING_CATEGORY(UNITY_WINDOW)
35
Q_DECLARE_LOGGING_CATEGORY(UNITY_WINDOW)
130
37
36
131
38
/**
37
/**
132
39
38
133
=== modified file 'qml/Components/WindowControlButtons.qml'
134
--- qml/Components/WindowControlButtons.qml	2016-10-27 14:54:48 +0000
135
+++ qml/Components/WindowControlButtons.qml	2017-01-19 15:00:39 +0000
136
@@ -29,6 +29,7 @@
137
29
    property bool windowIsMaximized: false
29
    property bool windowIsMaximized: false
138
30
    property bool closeButtonShown: true
30
    property bool closeButtonShown: true
139
31
    property bool maximizeButtonShown: true
31
    property bool maximizeButtonShown: true
140
32
    property bool minimizeButtonVisible: true
141
32
    property bool overlayShown
33
    property bool overlayShown
142
33
34
143
34
    signal closeClicked()
35
    signal closeClicked()
144
@@ -75,6 +76,7 @@
145
75
        height: parent.height
76
        height: parent.height
146
76
        width: height
77
        width: height
147
77
        onClicked: root.minimizeClicked()
78
        onClicked: root.minimizeClicked()
148
79
        visible: root.minimizeButtonVisible
149
78
80
150
79
        // We dont want touch events to fall through to parent,
81
        // We dont want touch events to fall through to parent,
151
80
        // otherwise the containsMouse will not work.
82
        // otherwise the containsMouse will not work.
152
81
83
153
=== added file 'qml/Stage/ChildWindow.qml'
154
--- qml/Stage/ChildWindow.qml	1970-01-01 00:00:00 +0000
155
+++ qml/Stage/ChildWindow.qml	2017-01-19 15:00:39 +0000
156
@@ -0,0 +1,159 @@
157
1
/*
158
2
 * Copyright (C) 2016 Canonical, Ltd.
159
3
 *
160
4
 * This program is free software; you can redistribute it and/or modify
161
5
 * it under the terms of the GNU General Public License as published by
162
6
 * the Free Software Foundation; version 3.
163
7
 *
164
8
 * This program is distributed in the hope that it will be useful,
165
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
166
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
167
11
 * GNU General Public License for more details.
168
12
 *
169
13
 * You should have received a copy of the GNU General Public License
170
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
171
15
 */
172
16
173
17
import QtQuick 2.4
174
18
import Ubuntu.Components 1.3
175
19
import Unity.Application 0.1
176
20
177
21
Item {
178
22
    id: root
179
23
180
24
    // Set from outside.
181
25
    property var surface
182
26
    property Item boundsItem
183
27
    property Item target
184
28
    property alias requestedWidth: surfaceContainer.requestedWidth
185
29
    property alias requestedHeight: surfaceContainer.requestedHeight
186
30
187
31
    width: surface ? surface.size.width : 0
188
32
    height: surface ? surface.size.height : 0
189
33
190
34
    // Make it get shown and hidden with a fade in/out effect
191
35
    opacity: surface && surface.state !== Mir.MinimizedState && surface.state !== Mir.HiddenState ? 1.0 : 0.0
192
36
    Behavior on opacity { UbuntuNumberAnimation {} }
193
37
    visible: opacity !== 0.0 // make it transparent to input as well
194
38
195
39
    readonly property bool dragging: windowResizeArea.dragging || d.touchOverlayDragging || d.moveHandlerDragging
196
40
197
41
    QtObject {
198
42
        id: d
199
43
        readonly property bool decorated:  surface ? surface.type === Mir.UtilityType
200
44
                                                       || surface.type === Mir.DialogType
201
45
                                                       || surface.type === Mir.NormalType
202
46
                                                   : false
203
47
204
48
        readonly property bool moveable: decorated
205
49
        readonly property bool resizeable: decorated
206
50
207
51
        property alias decoration: decorationLoader.item
208
52
        property alias moveHandler: moveHandlerLoader.item
209
53
210
54
        readonly property bool touchOverlayDragging: touchOverlayLoader.item ? touchOverlayLoader.item.dragging : false
211
55
        readonly property bool moveHandlerDragging: moveHandlerLoader.item ? moveHandlerLoader.item.dragging : false
212
56
    }
213
57
214
58
    WindowResizeArea {
215
59
        id: windowResizeArea
216
60
        anchors {
217
61
            top: decorationLoader.top
218
62
            bottom: parent.bottom
219
63
            left: parent.left; right: parent.right
220
64
        }
221
65
        target: root.target
222
66
        boundsItem: root.boundsItem
223
67
        minWidth: units.gu(10)
224
68
        minHeight: units.gu(10)
225
69
        borderThickness: units.gu(2)
226
70
        enabled: d.resizeable
227
71
        visible: enabled
228
72
        onPressed: root.surface.activate();
229
73
    }
230
74
231
75
    BorderImage {
232
76
        property real shadowThickness: root.surface && root.surface.focused ? units.gu(2) : units.gu(1.5)
233
77
        anchors {
234
78
            top: decorationLoader.top
235
79
            bottom: parent.bottom
236
80
            left: parent.left; right: parent.right
237
81
            margins: -shadowThickness
238
82
        }
239
83
        source: "../graphics/dropshadow2gu.sci"
240
84
        opacity: .3
241
85
    }
242
86
243
87
    Loader {
244
88
        id: decorationLoader
245
89
        anchors.bottom: root.top
246
90
        anchors.left: root.left
247
91
        anchors.right: root.right
248
92
249
93
        visible: active
250
94
        active: d.decorated
251
95
252
96
        height: item ? item.height : 0
253
97
254
98
        sourceComponent: Component {
255
99
            WindowDecoration {
256
100
                height: units.gu(3)
257
101
                title: root.surface ? root.surface.name : ""
258
102
                active: root.surface ? root.surface.focused : false
259
103
                closeButtonVisible: false
260
104
                minimizeButtonVisible: false
261
105
                maximizeButtonShown: false
262
106
                onPressed: root.surface.activate();
263
107
                onPressedChanged: if (d.moveHandler) { d.moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY); }
264
108
                onPositionChanged: if (d.moveHandler) {
265
109
                    d.moveHandler.handlePositionChanged(mouse);
266
110
                }
267
111
                onReleased: if (d.moveHandler) { d.moveHandler.handleReleased(); }
268
112
            }
269
113
        }
270
114
    }
271
115
272
116
    Loader {
273
117
        id: moveHandlerLoader
274
118
        active: d.moveable
275
119
        sourceComponent: Component {
276
120
            MoveHandler {
277
121
                target: root.target
278
122
                buttonsWidth: d.decoration ? d.decoration.buttonsWidth : 0
279
123
                boundsItem: root.boundsItem
280
124
                boundsTopMargin: decorationLoader.height
281
125
            }
282
126
        }
283
127
    }
284
128
285
129
    SurfaceContainer {
286
130
        id: surfaceContainer
287
131
288
132
        // Do not hold on to a dead surface so that it can be destroyed.
289
133
        // FIXME It should not be QML's job to release the MirSurface if its backing surface goes away. Instead backing
290
134
        //       MirSurface should go away but the MirSurfaceItem should be able to live on with the last drawn frame
291
135
        //       and properties.
292
136
        surface: root.surface && root.surface.live ? root.surface : null
293
137
294
138
        requestedWidth: surface ? surface.size.width : 0
295
139
        requestedHeight: surface ? surface.size.height : 0
296
140
297
141
        // TODO ChildWindow parent will probably want to control those
298
142
        interactive: true
299
143
        consumesInput: true
300
144
    }
301
145
302
146
    Loader {
303
147
        id: touchOverlayLoader
304
148
        active: d.resizeable || d.moveable
305
149
        anchors.top: decorationLoader.top
306
150
        anchors.bottom: parent.bottom
307
151
        anchors.left: parent.left
308
152
        anchors.right: parent.right
309
153
        sourceComponent: Component { WindowControlsOverlay {
310
154
            target: root.target
311
155
            resizeArea: windowResizeArea
312
156
            boundsItem: root.boundsItem
313
157
        } }
314
158
    }
315
159
}
316
0
160
317
=== added file 'qml/Stage/ChildWindowRepeater.qml'
318
--- qml/Stage/ChildWindowRepeater.qml	1970-01-01 00:00:00 +0000
319
+++ qml/Stage/ChildWindowRepeater.qml	2017-01-19 15:00:39 +0000
320
@@ -0,0 +1,28 @@
321
1
/*
322
2
 * Copyright (C) 2016 Canonical, Ltd.
323
3
 *
324
4
 * This program is free software; you can redistribute it and/or modify
325
5
 * it under the terms of the GNU General Public License as published by
326
6
 * the Free Software Foundation; version 3.
327
7
 *
328
8
 * This program is distributed in the hope that it will be useful,
329
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
330
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
331
11
 * GNU General Public License for more details.
332
12
 *
333
13
 * You should have received a copy of the GNU General Public License
334
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
335
15
 */
336
16
337
17
import QtQuick 2.4
338
18
339
19
// Meant to be created with a Loader to circumvent the "ChildWindowTree is instantiated recursively" error from the QML engine
340
20
Repeater {
341
21
    id: root
342
22
    property Item boundsItem
343
23
    delegate: ChildWindowTree {
344
24
        surface: model.surface
345
25
        z: root.count - model.index
346
26
        boundsItem: root.boundsItem
347
27
    }
348
28
}
349
0
29
350
=== added file 'qml/Stage/ChildWindowTree.qml'
351
--- qml/Stage/ChildWindowTree.qml	1970-01-01 00:00:00 +0000
352
+++ qml/Stage/ChildWindowTree.qml	2017-01-19 15:00:39 +0000
353
@@ -0,0 +1,127 @@
354
1
/*
355
2
 * Copyright (C) 2016 Canonical, Ltd.
356
3
 *
357
4
 * This program is free software; you can redistribute it and/or modify
358
5
 * it under the terms of the GNU General Public License as published by
359
6
 * the Free Software Foundation; version 3.
360
7
 *
361
8
 * This program is distributed in the hope that it will be useful,
362
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
363
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
364
11
 * GNU General Public License for more details.
365
12
 *
366
13
 * You should have received a copy of the GNU General Public License
367
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
368
15
 */
369
16
370
17
import QtQuick 2.4
371
18
import Ubuntu.Components 1.3
372
19
import Unity.Application 0.1
373
20
374
21
Item {
375
22
    id: root
376
23
377
24
    property alias surface: childWindow.surface
378
25
    property real displacementX: 0
379
26
    property real displacementY: 0
380
27
    property alias boundsItem: childWindow.boundsItem
381
28
382
29
    x: surface ? surface.position.x + displacementX : 0
383
30
    y: surface ? surface.position.y + displacementY : 0
384
31
    width: childWindow.width
385
32
    height: childWindow.height
386
33
387
34
    ////
388
35
    // API expected by MoveHandler (and some by WindowResizeArea as well)
389
36
    readonly property bool maximized: false
390
37
    readonly property bool maximizedLeft: false
391
38
    readonly property bool maximizedRight: false
392
39
    readonly property bool maximizedHorizontally: false
393
40
    readonly property bool maximizedVertically: false
394
41
    readonly property bool maximizedTopLeft: false
395
42
    readonly property bool maximizedTopRight: false
396
43
    readonly property bool maximizedBottomLeft: false
397
44
    readonly property bool maximizedBottomRight: false
398
45
    readonly property bool anyMaximized: maximized || maximizedLeft || maximizedRight || maximizedHorizontally || maximizedVertically ||
399
46
                                         maximizedTopLeft || maximizedTopRight || maximizedBottomLeft || maximizedBottomRight
400
47
401
48
    readonly property bool canBeCornerMaximized: false
402
49
    readonly property bool canBeMaximizedLeftRight: false
403
50
    readonly property bool canBeMaximized: false
404
51
405
52
    readonly property var resizeArea: QtObject {
406
53
        property real normalWidth: units.gu(1)
407
54
        property real normalHeight: units.gu(1)
408
55
    }
409
56
410
57
    readonly property bool windowedTransitionRunning: false
411
58
412
59
    // NB: those bindings will be overwritten by MoveHandler when you first move the window
413
60
    property real windowedX: x
414
61
    property real windowedY: y
415
62
416
63
417
64
    property real restoredX
418
65
    property real restoredY
419
66
420
67
    state: "restored"
421
68
    // end of API expected by MoveHandler
422
69
    ////
423
70
424
71
    ////
425
72
    // API expected by WindowResizeArea
426
73
    property real windowedWidth: childWindow.width
427
74
    property real windowedHeight: childWindow.height
428
75
    // end of API expected by WindowResizeArea
429
76
    ////
430
77
431
78
    ////
432
79
    // API expected by WindowControlsOverlay
433
80
    function activate() {
434
81
        surface.activate();
435
82
    }
436
83
    // end of API expected by WindowControlsOverlay
437
84
    ////
438
85
439
86
    Binding {
440
87
        target: root.surface
441
88
        when: childWindow.dragging
442
89
        property: "requestedPosition"
443
90
        value: Qt.point(root.windowedX - root.displacementX,
444
91
                        root.windowedY - root.displacementY);
445
92
    }
446
93
447
94
    // It's a separate Item so that a window can be hid independently of its children
448
95
    ChildWindow {
449
96
        id: childWindow
450
97
        target: root
451
98
        requestedWidth: root.windowedWidth
452
99
        requestedHeight: root.windowedHeight
453
100
    }
454
101
455
102
    Connections {
456
103
        target: root.surface
457
104
        onFocusRequested: {
458
105
            root.surface.activate();
459
106
        }
460
107
    }
461
108
462
109
    // Using a loader here mainly to circunvent the "ChildWindowTree is instantiated recursively" error from the QML engine
463
110
    Loader {
464
111
        id: childRepeaterLoader
465
112
        source: "ChildWindowRepeater.qml"
466
113
        active: root.surface && root.surface.childSurfaceList.count > 0
467
114
        Binding {
468
115
            target: childRepeaterLoader.item
469
116
            when: childRepeaterLoader.item
470
117
            property: "model"
471
118
            value: root.surface ? root.surface.childSurfaceList : null
472
119
        }
473
120
        Binding {
474
121
            target: childRepeaterLoader.item
475
122
            when: childRepeaterLoader.item
476
123
            property: "boundsItem"
477
124
            value: root.boundsItem
478
125
        }
479
126
    }
480
127
}
481
0
128
482
=== modified file 'qml/Stage/DecoratedWindow.qml'
483
--- qml/Stage/DecoratedWindow.qml	2016-12-12 11:16:47 +0000
484
+++ qml/Stage/DecoratedWindow.qml	2017-01-19 15:00:39 +0000
485
@@ -67,8 +67,7 @@
486
67
    readonly property int heightIncrement: !counterRotate ? applicationWindow.heightIncrement : applicationWindow.widthIncrement
67
    readonly property int heightIncrement: !counterRotate ? applicationWindow.heightIncrement : applicationWindow.widthIncrement
487
68
68
488
69
    property alias overlayShown: decoration.overlayShown
69
    property alias overlayShown: decoration.overlayShown
491
70
    property alias stageWidth: moveHandler.stageWidth
70
    property alias boundsItem: moveHandler.boundsItem
490
71
    property alias stageHeight: moveHandler.stageHeight
492
72
    readonly property alias dragging: moveHandler.dragging
71
    readonly property alias dragging: moveHandler.dragging
493
73
72
494
74
    readonly property Item clientAreaItem: applicationWindow
73
    readonly property Item clientAreaItem: applicationWindow
495
@@ -196,18 +195,19 @@
496
196
        ]
195
        ]
497
197
    }
196
    }
498
198
197
500
199
    MouseArea {
198
    WindowDecoration {
501
199
        id: decoration
502
200
        closeButtonVisible: root.application.appId !== "unity8-dash"
503
201
        objectName: "appWindowDecoration"
504
202
505
200
        anchors { left: parent.left; top: parent.top; right: parent.right }
203
        anchors { left: parent.left; top: parent.top; right: parent.right }
506
201
        height: units.gu(3)
204
        height: units.gu(3)
507
202
205
508
206
        title: applicationWindow.title
509
207
510
203
        opacity: root.hasDecoration ? Math.min(1, root.showDecoration) : 0
208
        opacity: root.hasDecoration ? Math.min(1, root.showDecoration) : 0
511
204
512
205
        Behavior on opacity { UbuntuNumberAnimation { } }
209
        Behavior on opacity { UbuntuNumberAnimation { } }
513
206
210
514
207
        drag.target: Item {}
515
208
        drag.filterChildren: true
516
209
        drag.threshold: 0
517
210
518
211
        onPressed: root.decorationPressed();
211
        onPressed: root.decorationPressed();
519
212
        onPressedChanged: moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY)
212
        onPressedChanged: moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY)
520
213
        onPositionChanged: moveHandler.handlePositionChanged(mouse)
213
        onPositionChanged: moveHandler.handlePositionChanged(mouse)
521
@@ -216,47 +216,39 @@
522
216
            moveHandler.handleReleased();
216
            moveHandler.handleReleased();
523
217
        }
217
        }
524
218
218
561
219
        WindowDecoration {
219
        onCloseClicked: root.closeClicked();
562
220
            id: decoration
220
        onMaximizeClicked: { root.decorationPressed(); root.maximizeClicked(); }
563
221
            closeButtonVisible: root.application.appId !== "unity8-dash"
221
        onMaximizeHorizontallyClicked: { root.decorationPressed(); root.maximizeHorizontallyClicked(); }
564
222
            objectName: "appWindowDecoration"
222
        onMaximizeVerticallyClicked: { root.decorationPressed(); root.maximizeVerticallyClicked(); }
565
223
            anchors.fill: parent
223
        onMinimizeClicked: root.minimizeClicked();
566
224
            title: applicationWindow.title
224
567
225
225
        enableMenus: {
568
226
            onCloseClicked: root.closeClicked();
226
            return active &&
569
227
            onMaximizeClicked: { root.decorationPressed(); root.maximizeClicked(); }
227
                     surface &&
570
228
            onMaximizeHorizontallyClicked: { root.decorationPressed(); root.maximizeHorizontallyClicked(); }
228
                      (PanelState.focusedPersistentSurfaceId === surface.persistentId && !PanelState.decorationsVisible)
571
229
            onMaximizeVerticallyClicked: { root.decorationPressed(); root.maximizeVerticallyClicked(); }
229
        }
572
230
            onMinimizeClicked: root.minimizeClicked();
230
        menu: sharedAppModel.model
573
231
231
574
232
            enableMenus: {
232
        Indicators.SharedUnityMenuModel {
575
233
                return active &&
233
            id: sharedAppModel
576
234
                         surface &&
234
            property var menus: surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : []
577
235
                          (PanelState.focusedPersistentSurfaceId === surface.persistentId && !PanelState.decorationsVisible)
235
            property var menuService: menus.length > 0 ? menus[0] : undefined
578
236
            }
236
579
237
            menu: sharedAppModel.model
237
            busName: menuService ? menuService.service : ""
580
238
238
            menuObjectPath: menuService && menuService.menuPath ? menuService.menuPath : ""
581
239
            Indicators.SharedUnityMenuModel {
239
            actions: menuService && menuService.actionPath ? { "unity": menuService.actionPath } : {}
582
240
                id: sharedAppModel
240
        }
583
241
                property var menus: surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : []
241
584
242
                property var menuService: menus.length > 0 ? menus[0] : undefined
242
        Connections {
585
243
243
            target: ApplicationMenuRegistry
586
244
                busName: menuService ? menuService.service : ""
244
            onSurfaceMenuRegistered: {
587
245
                menuObjectPath: menuService && menuService.menuPath ? menuService.menuPath : ""
245
                if (surface && surfaceId === surface.persistentId) {
588
246
                actions: menuService && menuService.actionPath ? { "unity": menuService.actionPath } : {}
246
                    sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
553
247
            }
554
248
555
249
            Connections {
556
250
                target: ApplicationMenuRegistry
557
251
                onSurfaceMenuRegistered: {
558
252
                    if (surface && surfaceId === surface.persistentId) {
559
253
                        sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
560
254
                    }
589
255
                }
247
                }
594
256
                onSurfaceMenuUnregistered: {
248
            }
595
257
                    if (surface && surfaceId === surface.persistentId) {
249
            onSurfaceMenuUnregistered: {
596
258
                        sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
250
                if (surface && surfaceId === surface.persistentId) {
597
259
                    }
251
                    sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
598
260
                }
252
                }
599
261
            }
253
            }
600
262
        }
254
        }
601
263
255
602
=== modified file 'qml/Stage/MoveHandler.qml'
603
--- qml/Stage/MoveHandler.qml	2016-12-12 16:45:09 +0000
604
+++ qml/Stage/MoveHandler.qml	2017-01-19 15:00:39 +0000
605
@@ -19,15 +19,14 @@
606
19
import Ubuntu.Components 1.3
19
import Ubuntu.Components 1.3
607
20
import Utils 0.1
20
import Utils 0.1
608
21
import "../Components"
21
import "../Components"
609
22
import "../Components/PanelState"
610
23
22
611
24
QtObject {
23
QtObject {
612
25
    id: root
24
    id: root
613
26
25
614
27
    property Item target // appDelegate
26
    property Item target // appDelegate
615
28
    property int stageWidth
616
29
    property int stageHeight
617
30
    property real buttonsWidth: 0
27
    property real buttonsWidth: 0
618
28
    property Item boundsItem
619
29
    property real boundsTopMargin: 0
620
31
30
621
32
    readonly property bool dragging: priv.dragging
31
    readonly property bool dragging: priv.dragging
622
33
32
623
@@ -79,7 +78,10 @@
624
79
            // length of the triggerArea square diagonal
78
            // length of the triggerArea square diagonal
625
80
            var diagLength = Math.sqrt(2 * priv.triggerArea * priv.triggerArea);
79
            var diagLength = Math.sqrt(2 * priv.triggerArea * priv.triggerArea);
626
81
            var ratio = 1 - (distance / diagLength);
80
            var ratio = 1 - (distance / diagLength);
628
82
            return bx > 0 && bx <= stageWidth && by > 0 && by <= stageHeight ? ratio : 1; // everything "outside" of our square from the center is 1
81
629
82
            // everything "outside" of our square from the center is 1
630
83
            var mousePosBoundsCoords = target.mapToItem(root.boundsItem, bx, by);
631
84
            return root.boundsItem.contains(mousePosBoundsCoords) ? ratio : 1;
632
83
        }
85
        }
633
84
        property real progress: 0
86
        property real progress: 0
634
85
    }
87
    }
635
@@ -117,35 +119,38 @@
636
117
                target.requestRestore();
119
                target.requestRestore();
637
118
            }
120
            }
638
119
121
640
120
            var pos = mapToItem(target.parent, mouse.x, mouse.y);
122
            var pos = mapToItem(target.parent, mouse.x, mouse.y); // How can that work if we're just a QtObject (not an Item)?
641
123
            var bounds = boundsItem.mapToItem(target.parent, 0, 0, boundsItem.width, boundsItem.height);
642
124
            bounds.y += boundsTopMargin;
643
125
            bounds.height -= boundsTopMargin;
644
121
            // Use integer coordinate values to ensure that target is left in a pixel-aligned
126
            // Use integer coordinate values to ensure that target is left in a pixel-aligned
645
122
            // position. Mouse movement could have subpixel precision, yielding a fractional
127
            // position. Mouse movement could have subpixel precision, yielding a fractional
646
123
            // mouse position.
128
            // mouse position.
647
124
            target.windowedX = Math.round(pos.x - priv.distanceX);
129
            target.windowedX = Math.round(pos.x - priv.distanceX);
649
125
            target.windowedY = Math.round(Math.max(pos.y - priv.distanceY, PanelState.panelHeight));
130
            target.windowedY = Math.round(Math.max(pos.y - priv.distanceY, bounds.top));
650
126
131
651
127
            if (sensingPoints) { // edge/corner detection when dragging via the touch overlay
132
            if (sensingPoints) { // edge/corner detection when dragging via the touch overlay
653
128
                if (sensingPoints.topLeft.x < priv.triggerArea && sensingPoints.topLeft.y < PanelState.panelHeight + priv.triggerArea
133
                if (sensingPoints.topLeft.x < priv.triggerArea && sensingPoints.topLeft.y < bounds.top + priv.triggerArea
654
129
                        && target.canBeCornerMaximized) { // top left
134
                        && target.canBeCornerMaximized) { // top left
656
130
                    priv.progress = priv.progressInCorner(0, PanelState.panelHeight, sensingPoints.topLeft.x, sensingPoints.topLeft.y);
135
                    priv.progress = priv.progressInCorner(bounds.left, bounds.top, sensingPoints.topLeft.x, sensingPoints.topLeft.y);
657
131
                    priv.resetEdges();
136
                    priv.resetEdges();
658
132
                    priv.nearTopLeftCorner = true;
137
                    priv.nearTopLeftCorner = true;
659
133
                    root.fakeMaximizeTopLeftAnimationRequested(priv.progress);
138
                    root.fakeMaximizeTopLeftAnimationRequested(priv.progress);
661
134
                } else if (sensingPoints.topRight.x > stageWidth - priv.triggerArea && sensingPoints.topRight.y < PanelState.panelHeight + priv.triggerArea
139
                } else if (sensingPoints.topRight.x > bounds.right - priv.triggerArea && sensingPoints.topRight.y < bounds.top + priv.triggerArea
662
135
                           && target.canBeCornerMaximized) { // top right
140
                           && target.canBeCornerMaximized) { // top right
664
136
                    priv.progress = priv.progressInCorner(stageWidth, PanelState.panelHeight, sensingPoints.topRight.x, sensingPoints.topRight.y);
141
                    priv.progress = priv.progressInCorner(bounds.right, bounds.top, sensingPoints.topRight.x, sensingPoints.topRight.y);
665
137
                    priv.resetEdges();
142
                    priv.resetEdges();
666
138
                    priv.nearTopRightCorner = true;
143
                    priv.nearTopRightCorner = true;
667
139
                    root.fakeMaximizeTopRightAnimationRequested(priv.progress);
144
                    root.fakeMaximizeTopRightAnimationRequested(priv.progress);
669
140
                } else if (sensingPoints.bottomLeft.x < priv.triggerArea && sensingPoints.bottomLeft.y > stageHeight - priv.triggerArea
145
                } else if (sensingPoints.bottomLeft.x < priv.triggerArea && sensingPoints.bottomLeft.y > bounds.bottom - priv.triggerArea
670
141
                           && target.canBeCornerMaximized) { // bottom left
146
                           && target.canBeCornerMaximized) { // bottom left
672
142
                    priv.progress = priv.progressInCorner(0, stageHeight, sensingPoints.bottomLeft.x, sensingPoints.bottomLeft.y);
147
                    priv.progress = priv.progressInCorner(bounds.left, bounds.bottom, sensingPoints.bottomLeft.x, sensingPoints.bottomLeft.y);
673
143
                    priv.resetEdges();
148
                    priv.resetEdges();
674
144
                    priv.nearBottomLeftCorner = true;
149
                    priv.nearBottomLeftCorner = true;
675
145
                    root.fakeMaximizeBottomLeftAnimationRequested(priv.progress);
150
                    root.fakeMaximizeBottomLeftAnimationRequested(priv.progress);
677
146
                } else if (sensingPoints.bottomRight.x > stageWidth - priv.triggerArea && sensingPoints.bottomRight.y > stageHeight - priv.triggerArea
151
                } else if (sensingPoints.bottomRight.x > bounds.right - priv.triggerArea && sensingPoints.bottomRight.y > bounds.bottom - priv.triggerArea
678
147
                           && target.canBeCornerMaximized) { // bottom right
152
                           && target.canBeCornerMaximized) { // bottom right
680
148
                    priv.progress = priv.progressInCorner(stageWidth, stageHeight, sensingPoints.bottomRight.x, sensingPoints.bottomRight.y);
153
                    priv.progress = priv.progressInCorner(bounds.right, bounds.bottom, sensingPoints.bottomRight.x, sensingPoints.bottomRight.y);
681
149
                    priv.resetEdges();
154
                    priv.resetEdges();
682
150
                    priv.nearBottomRightCorner = true;
155
                    priv.nearBottomRightCorner = true;
683
151
                    root.fakeMaximizeBottomRightAnimationRequested(priv.progress);
156
                    root.fakeMaximizeBottomRightAnimationRequested(priv.progress);
684
@@ -154,13 +159,13 @@
685
154
                    priv.resetEdges();
159
                    priv.resetEdges();
686
155
                    priv.nearLeftEdge = true;
160
                    priv.nearLeftEdge = true;
687
156
                    root.fakeMaximizeLeftAnimationRequested(priv.progress);
161
                    root.fakeMaximizeLeftAnimationRequested(priv.progress);
690
157
                } else if (sensingPoints.right.x > stageWidth - priv.triggerArea && target.canBeMaximizedLeftRight) { // right
162
                } else if (sensingPoints.right.x > bounds.right - priv.triggerArea && target.canBeMaximizedLeftRight) { // right
691
158
                    priv.progress = MathUtils.clampAndProject(sensingPoints.right.x, stageWidth - priv.triggerArea, stageWidth, 0, 1);
163
                    priv.progress = MathUtils.clampAndProject(sensingPoints.right.x, bounds.right - priv.triggerArea, bounds.right, 0, 1);
692
159
                    priv.resetEdges();
164
                    priv.resetEdges();
693
160
                    priv.nearRightEdge = true;
165
                    priv.nearRightEdge = true;
694
161
                    root.fakeMaximizeRightAnimationRequested(priv.progress);
166
                    root.fakeMaximizeRightAnimationRequested(priv.progress);
697
162
                } else if (sensingPoints.top.y < PanelState.panelHeight + priv.triggerArea && target.canBeMaximized) { // top
167
                } else if (sensingPoints.top.y < bounds.top + priv.triggerArea && target.canBeMaximized) { // top
698
163
                    priv.progress = MathUtils.clampAndProject(sensingPoints.top.y, PanelState.panelHeight + priv.triggerArea, 0, 0, 1);
168
                    priv.progress = MathUtils.clampAndProject(sensingPoints.top.y, bounds.top + priv.triggerArea, 0, 0, 1);
699
164
                    priv.resetEdges();
169
                    priv.resetEdges();
700
165
                    priv.nearTopEdge = true;
170
                    priv.nearTopEdge = true;
701
166
                    root.fakeMaximizeAnimationRequested(priv.progress);
171
                    root.fakeMaximizeAnimationRequested(priv.progress);
702
167
172
703
=== modified file 'qml/Stage/Stage.qml'
704
--- qml/Stage/Stage.qml	2017-01-03 12:04:08 +0000
705
+++ qml/Stage/Stage.qml	2017-01-19 15:00:39 +0000
706
@@ -665,6 +665,13 @@
707
665
            }
665
            }
708
666
        }
666
        }
709
667
667
710
668
        Item {
711
669
            id: boundariesForWindowPlacement
712
670
            anchors.fill: parent
713
671
            anchors.topMargin: PanelState.panelHeight
714
672
            visible: false
715
673
        }
716
674
717
668
        Repeater {
675
        Repeater {
718
669
            id: appRepeater
676
            id: appRepeater
719
670
            model: topLevelSurfaceList
677
            model: topLevelSurfaceList
720
@@ -833,7 +840,6 @@
721
833
                readonly property var surface: model.window.surface
840
                readonly property var surface: model.window.surface
722
834
                readonly property var window: model.window
841
                readonly property var window: model.window
723
835
842
724
836
                readonly property alias resizeArea: resizeArea
725
837
                readonly property alias focusedSurface: decoratedWindow.focusedSurface
843
                readonly property alias focusedSurface: decoratedWindow.focusedSurface
726
838
                readonly property bool dragging: touchControls.overlayShown ? touchControls.dragging : decoratedWindow.dragging
844
                readonly property bool dragging: touchControls.overlayShown ? touchControls.dragging : decoratedWindow.dragging
727
839
845
728
@@ -890,7 +896,7 @@
729
890
                    screenWidth: appContainer.width
896
                    screenWidth: appContainer.width
730
891
                    screenHeight: appContainer.height
897
                    screenHeight: appContainer.height
731
892
                    leftMargin: root.leftMargin
898
                    leftMargin: root.leftMargin
733
893
                    minimumY: PanelState.panelHeight
899
                    minimumY: boundariesForWindowPlacement.y
734
894
                }
900
                }
735
895
901
736
896
                Connections {
902
                Connections {
737
@@ -1520,7 +1526,7 @@
738
1520
                    anchors.margins: touchControls.overlayShown ? borderThickness/2 : -borderThickness
1526
                    anchors.margins: touchControls.overlayShown ? borderThickness/2 : -borderThickness
739
1521
1527
740
1522
                    target: appDelegate
1528
                    target: appDelegate
742
1523
                    minimumY: PanelState.panelHeight // disallow resizing up past Panel
1529
                    boundsItem: boundariesForWindowPlacement
743
1524
                    minWidth: units.gu(10)
1530
                    minWidth: units.gu(10)
744
1525
                    minHeight: units.gu(10)
1531
                    minHeight: units.gu(10)
745
1526
                    borderThickness: units.gu(2)
1532
                    borderThickness: units.gu(2)
746
@@ -1539,7 +1545,7 @@
747
1539
                    anchors.top: appDelegate.top
1545
                    anchors.top: appDelegate.top
748
1540
                    application: model.application
1546
                    application: model.application
749
1541
                    surface: model.window.surface
1547
                    surface: model.window.surface
751
1542
                    active: appDelegate.focus
1548
                    active: model.window.focused
752
1543
                    focus: true
1549
                    focus: true
753
1544
                    interactive: root.interactive
1550
                    interactive: root.interactive
754
1545
                    showDecoration: 1
1551
                    showDecoration: 1
755
@@ -1548,8 +1554,7 @@
756
1548
                    width: implicitWidth
1554
                    width: implicitWidth
757
1549
                    height: implicitHeight
1555
                    height: implicitHeight
758
1550
                    highlightSize: windowInfoItem.iconMargin / 2
1556
                    highlightSize: windowInfoItem.iconMargin / 2
761
1551
                    stageWidth: appContainer.width
1557
                    boundsItem: boundariesForWindowPlacement
760
1552
                    stageHeight: appContainer.height
762
1553
1558
763
1554
                    requestedWidth: appDelegate.requestedWidth
1559
                    requestedWidth: appDelegate.requestedWidth
764
1555
                    requestedHeight: appDelegate.requestedHeight
1560
                    requestedHeight: appDelegate.requestedHeight
765
@@ -1604,11 +1609,12 @@
766
1604
1609
767
1605
                WindowControlsOverlay {
1610
                WindowControlsOverlay {
768
1606
                    id: touchControls
1611
                    id: touchControls
769
1612
                    anchors.fill: appDelegate
770
1607
                    target: appDelegate
1613
                    target: appDelegate
771
1614
                    resizeArea: resizeArea
772
1608
                    enabled: false
1615
                    enabled: false
773
1609
                    visible: enabled
1616
                    visible: enabled
776
1610
                    stageWidth: appContainer.width
1617
                    boundsItem: boundariesForWindowPlacement
775
1611
                    stageHeight: appContainer.height
777
1612
1618
778
1613
                    onFakeMaximizeAnimationRequested: if (!appDelegate.maximized) fakeRectangle.maximize(amount, true)
1619
                    onFakeMaximizeAnimationRequested: if (!appDelegate.maximized) fakeRectangle.maximize(amount, true)
779
1614
                    onFakeMaximizeLeftAnimationRequested: if (!appDelegate.maximizedLeft) fakeRectangle.maximizeLeft(amount, true)
1620
                    onFakeMaximizeLeftAnimationRequested: if (!appDelegate.maximizedLeft) fakeRectangle.maximizeLeft(amount, true)
780
@@ -1703,6 +1709,41 @@
781
1703
                        sourceSize.height: height
1709
                        sourceSize.height: height
782
1704
                    }
1710
                    }
783
1705
                }
1711
                }
784
1712
785
1713
                Item {
786
1714
                    // Group all child windows in this item so that we can fade them out together when going to the spread
787
1715
                    // (and fade them in back again when returning from it)
788
1716
                    readonly property bool stageOnProperState: root.state === "windowed"
789
1717
                                                            || root.state === "staged"
790
1718
                                                            || root.state === "stagedWithSideStage"
791
1719
792
1720
                    // TODO: Is it worth the extra cost of layering to avoid the opacity artifacts of intersecting children?
793
1721
                    //       Btw, will involve more than uncommenting the line below as children won't necessarily fit this item's
794
1722
                    //       geometry. This is just a reference.
795
1723
                    //layer.enabled: opacity !== 0.0 && opacity !== 1.0
796
1724
797
1725
                    opacity: stageOnProperState ? 1.0 : 0.0
798
1726
                    visible: opacity !== 0.0 // make it transparent to input as well
799
1727
                    Behavior on opacity { UbuntuNumberAnimation {} }
800
1728
801
1729
                    Repeater {
802
1730
                        id: childWindowRepeater
803
1731
                        model: appDelegate.surface ? appDelegate.surface.childSurfaceList : null
804
1732
805
1733
                        delegate: ChildWindowTree {
806
1734
                            surface: model.surface
807
1735
808
1736
                            // Account for the displacement caused by window decoration in the top-level surface
809
1737
                            // Ie, the top-level surface is not positioned at (0,0) of this ChildWindow's parent (appDelegate)
810
1738
                            displacementX: appDelegate.clientAreaItem.x
811
1739
                            displacementY: appDelegate.clientAreaItem.y
812
1740
813
1741
                            boundsItem: boundariesForWindowPlacement
814
1742
815
1743
                            z: childWindowRepeater.count - model.index
816
1744
                        }
817
1745
                    }
818
1746
                }
819
1706
            }
1747
            }
820
1707
        }
1748
        }
821
1708
    }
1749
    }
822
1709
1750
823
=== modified file 'qml/Stage/WindowControlsOverlay.qml'
824
--- qml/Stage/WindowControlsOverlay.qml	2016-12-27 22:09:12 +0000
825
+++ qml/Stage/WindowControlsOverlay.qml	2017-01-19 15:00:39 +0000
826
@@ -18,17 +18,14 @@
827
18
import Ubuntu.Components 1.3
18
import Ubuntu.Components 1.3
828
19
import Ubuntu.Gestures 0.1
19
import Ubuntu.Gestures 0.1
829
20
import Unity.Application 0.1
20
import Unity.Application 0.1
830
21
import "../Components/PanelState"
831
22
21
832
23
Item {
22
Item {
833
24
    id: root
23
    id: root
834
25
    enabled: target && !target.fullscreen
835
26
    anchors.fill: target
836
27
24
837
28
    // to be set from outside
25
    // to be set from outside
838
29
    property Item target // appDelegate
26
    property Item target // appDelegate
841
30
    property alias stageWidth: moveHandler.stageWidth
27
    property WindowResizeArea resizeArea
842
31
    property alias stageHeight: moveHandler.stageHeight
28
    property Item boundsItem
843
32
29
844
33
    // to be read from outside
30
    // to be read from outside
845
34
    readonly property alias overlayShown: overlay.visible
31
    readonly property alias overlayShown: overlay.visible
846
@@ -90,9 +87,7 @@
847
90
87
848
91
    QtObject {
88
    QtObject {
849
92
        id: priv
89
        id: priv
853
93
        readonly property var resizeArea: root.target && root.target.resizeArea ? root.target.resizeArea : null
90
        readonly property bool dragging: moveHandler.dragging || (root.resizeArea && root.resizeArea.dragging)
851
94
        readonly property bool ensureWindow: root.target.state == "normal" || root.target.state == "restored"
852
95
        readonly property bool dragging: moveHandler.dragging || (resizeArea && resizeArea.dragging)
854
96
91
855
97
        function getSensingPoints() {
92
        function getSensingPoints() {
856
98
            var xPoints = [];
93
            var xPoints = [];
857
@@ -162,6 +157,8 @@
858
162
                objectName: "moveHandler"
157
                objectName: "moveHandler"
859
163
                target: root.target
158
                target: root.target
860
164
159
861
160
                boundsItem: root.boundsItem
862
161
863
165
                onFakeMaximizeAnimationRequested: root.fakeMaximizeAnimationRequested(amount)
162
                onFakeMaximizeAnimationRequested: root.fakeMaximizeAnimationRequested(amount)
864
166
                onFakeMaximizeLeftAnimationRequested: root.fakeMaximizeLeftAnimationRequested(amount)
163
                onFakeMaximizeLeftAnimationRequested: root.fakeMaximizeLeftAnimationRequested(amount)
865
167
                onFakeMaximizeRightAnimationRequested: root.fakeMaximizeRightAnimationRequested(amount)
164
                onFakeMaximizeRightAnimationRequested: root.fakeMaximizeRightAnimationRequested(amount)
866
@@ -193,65 +190,65 @@
867
193
        ResizeGrip { // top left
190
        ResizeGrip { // top left
868
194
            anchors.horizontalCenter: parent.left
191
            anchors.horizontalCenter: parent.left
869
195
            anchors.verticalCenter: parent.top
192
            anchors.verticalCenter: parent.top
872
196
            visible: priv.ensureWindow || target.maximizedBottomRight
193
            visible: root.enabled || target.maximizedBottomRight
873
197
            resizeTarget: priv.resizeArea
194
            resizeTarget: root.resizeArea
874
198
        }
195
        }
875
199
196
876
200
        ResizeGrip { // top center
197
        ResizeGrip { // top center
877
201
            anchors.horizontalCenter: parent.horizontalCenter
198
            anchors.horizontalCenter: parent.horizontalCenter
878
202
            anchors.verticalCenter: parent.top
199
            anchors.verticalCenter: parent.top
879
203
            rotation: 45
200
            rotation: 45
882
204
            visible: priv.ensureWindow || target.maximizedHorizontally || target.maximizedBottomLeft || target.maximizedBottomRight
201
            visible: root.enabled || target.maximizedHorizontally || target.maximizedBottomLeft || target.maximizedBottomRight
883
205
            resizeTarget: priv.resizeArea
202
            resizeTarget: root.resizeArea
884
206
        }
203
        }
885
207
204
886
208
        ResizeGrip { // top right
205
        ResizeGrip { // top right
887
209
            anchors.horizontalCenter: parent.right
206
            anchors.horizontalCenter: parent.right
888
210
            anchors.verticalCenter: parent.top
207
            anchors.verticalCenter: parent.top
889
211
            rotation: 90
208
            rotation: 90
892
212
            visible: priv.ensureWindow || target.maximizedBottomLeft
209
            visible: root.enabled || target.maximizedBottomLeft
893
213
            resizeTarget: priv.resizeArea
210
            resizeTarget: root.resizeArea
894
214
        }
211
        }
895
215
212
896
216
        ResizeGrip { // right
213
        ResizeGrip { // right
897
217
            anchors.horizontalCenter: parent.right
214
            anchors.horizontalCenter: parent.right
898
218
            anchors.verticalCenter: parent.verticalCenter
215
            anchors.verticalCenter: parent.verticalCenter
899
219
            rotation: 135
216
            rotation: 135
901
220
            visible: priv.ensureWindow || target.maximizedVertically || target.maximizedLeft ||
217
            visible: root.enabled || target.maximizedVertically || target.maximizedLeft ||
902
221
                     target.maximizedTopLeft || target.maximizedBottomLeft
218
                     target.maximizedTopLeft || target.maximizedBottomLeft
904
222
            resizeTarget: priv.resizeArea
219
            resizeTarget: root.resizeArea
905
223
        }
220
        }
906
224
221
907
225
        ResizeGrip { // bottom right
222
        ResizeGrip { // bottom right
908
226
            anchors.horizontalCenter: parent.right
223
            anchors.horizontalCenter: parent.right
909
227
            anchors.verticalCenter: parent.bottom
224
            anchors.verticalCenter: parent.bottom
912
228
            visible: priv.ensureWindow || target.maximizedTopLeft
225
            visible: root.enabled || target.maximizedTopLeft
913
229
            resizeTarget: priv.resizeArea
226
            resizeTarget: root.resizeArea
914
230
        }
227
        }
915
231
228
916
232
        ResizeGrip { // bottom center
229
        ResizeGrip { // bottom center
917
233
            anchors.horizontalCenter: parent.horizontalCenter
230
            anchors.horizontalCenter: parent.horizontalCenter
918
234
            anchors.verticalCenter: parent.bottom
231
            anchors.verticalCenter: parent.bottom
919
235
            rotation: 45
232
            rotation: 45
922
236
            visible: priv.ensureWindow || target.maximizedHorizontally || target.maximizedTopLeft || target.maximizedTopRight
233
            visible: root.enabled || target.maximizedHorizontally || target.maximizedTopLeft || target.maximizedTopRight
923
237
            resizeTarget: priv.resizeArea
234
            resizeTarget: root.resizeArea
924
238
        }
235
        }
925
239
236
926
240
        ResizeGrip { // bottom left
237
        ResizeGrip { // bottom left
927
241
            anchors.horizontalCenter: parent.left
238
            anchors.horizontalCenter: parent.left
928
242
            anchors.verticalCenter: parent.bottom
239
            anchors.verticalCenter: parent.bottom
929
243
            rotation: 90
240
            rotation: 90
932
244
            visible: priv.ensureWindow || target.maximizedTopRight
241
            visible: root.enabled || target.maximizedTopRight
933
245
            resizeTarget: priv.resizeArea
242
            resizeTarget: root.resizeArea
934
246
        }
243
        }
935
247
244
936
248
        ResizeGrip { // left
245
        ResizeGrip { // left
937
249
            anchors.horizontalCenter: parent.left
246
            anchors.horizontalCenter: parent.left
938
250
            anchors.verticalCenter: parent.verticalCenter
247
            anchors.verticalCenter: parent.verticalCenter
939
251
            rotation: 135
248
            rotation: 135
941
252
            visible: priv.ensureWindow || target.maximizedVertically || target.maximizedRight ||
249
            visible: root.enabled || target.maximizedVertically || target.maximizedRight ||
942
253
                     target.maximizedTopRight || target.maximizedBottomRight
250
                     target.maximizedTopRight || target.maximizedBottomRight
944
254
            resizeTarget: priv.resizeArea
251
            resizeTarget: root.resizeArea
945
255
        }
252
        }
946
256
    }
253
    }
947
257
}
254
}
948
258
255
949
=== modified file 'qml/Stage/WindowDecoration.qml'
950
--- qml/Stage/WindowDecoration.qml	2016-12-12 11:16:47 +0000
951
+++ qml/Stage/WindowDecoration.qml	2017-01-19 15:00:39 +0000
952
@@ -28,6 +28,7 @@
953
28
    property alias closeButtonVisible: buttons.closeButtonShown
28
    property alias closeButtonVisible: buttons.closeButtonShown
954
29
    property alias title: titleLabel.text
29
    property alias title: titleLabel.text
955
30
    property alias maximizeButtonShown: buttons.maximizeButtonShown
30
    property alias maximizeButtonShown: buttons.maximizeButtonShown
956
31
    property alias minimizeButtonVisible: buttons.minimizeButtonVisible
957
31
    property bool active: false
32
    property bool active: false
958
32
    property alias overlayShown: buttons.overlayShown
33
    property alias overlayShown: buttons.overlayShown
959
33
    property var menu: undefined
34
    property var menu: undefined
960
@@ -38,6 +39,10 @@
961
38
    acceptedButtons: Qt.AllButtons // prevent leaking unhandled mouse events
39
    acceptedButtons: Qt.AllButtons // prevent leaking unhandled mouse events
962
39
    hoverEnabled: true
40
    hoverEnabled: true
963
40
41
964
42
    drag.target: Item {}
965
43
    drag.filterChildren: true
966
44
    drag.threshold: 0
967
45
968
41
    signal closeClicked()
46
    signal closeClicked()
969
42
    signal minimizeClicked()
47
    signal minimizeClicked()
970
43
    signal maximizeClicked()
48
    signal maximizeClicked()
971
@@ -64,8 +69,8 @@
972
64
                                       (menuBar.showRequested || root.containsMouse)
69
                                       (menuBar.showRequested || root.containsMouse)
973
65
    }
70
    }
974
66
71
977
67
    // We dont want touch events to fall through to parent,
72
    // We dont want touch events to fall through to parent as it expect some child MouseArea to have them
978
68
    // otherwise the containsMouse will not work.
73
    // If not some MouseArea in the menu bar, it will be this one.
979
69
    MouseArea {
74
    MouseArea {
980
70
        anchors.fill: parent
75
        anchors.fill: parent
981
71
        propagateComposedEvents: true
76
        propagateComposedEvents: true
982
72
77
983
=== modified file 'qml/Stage/WindowResizeArea.qml'
984
--- qml/Stage/WindowResizeArea.qml	2016-12-12 16:45:09 +0000
985
+++ qml/Stage/WindowResizeArea.qml	2017-01-19 15:00:39 +0000
986
@@ -32,7 +32,7 @@
987
32
    // The area will anchor to it and manage resize events
32
    // The area will anchor to it and manage resize events
988
33
    property Item target: null
33
    property Item target: null
989
34
    property int borderThickness: 0
34
    property int borderThickness: 0
991
35
    property real minimumY: -100000000 // By default, impose no limit
35
    property Item boundsItem
992
36
    property int minWidth: 0
36
    property int minWidth: 0
993
37
    property int minHeight: 0
37
    property int minHeight: 0
994
38
38
995
@@ -243,7 +243,8 @@
996
243
        }
243
        }
997
244
244
998
245
        if (d.topBorder) {
245
        if (d.topBorder) {
1000
246
            var newTargetY = Math.max(d.startY + deltaY, root.minimumY);
246
            var bounds = boundsItem.mapToItem(target.parent, 0, 0, boundsItem.width, boundsItem.height);
1001
247
            var newTargetY = Math.max(d.startY + deltaY, bounds.y);
1002
247
            var bottomBorderY = target.windowedY + target.height;
248
            var bottomBorderY = target.windowedY + target.height;
1003
248
            if (bottomBorderY > newTargetY + d.minimumHeight) {
249
            if (bottomBorderY > newTargetY + d.minimumHeight) {
1004
249
                if (bottomBorderY < newTargetY + d.maximumHeight) {
250
                if (bottomBorderY < newTargetY + d.maximumHeight) {
1005
250
251
1006
=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
1007
--- tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-12-20 15:50:41 +0000
1008
+++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2017-01-19 15:00:39 +0000
1009
@@ -94,6 +94,7 @@
1010
94
    auto surface = surfaceManager->createSurface(QString("prompt foo"),
94
    auto surface = surfaceManager->createSurface(QString("prompt foo"),
1011
95
            Mir::NormalType,
95
            Mir::NormalType,
1012
96
            Mir::RestoredState,
96
            Mir::RestoredState,
1013
97
            nullptr, /* parentSurface */
1014
97
            screenshotUrl);
98
            screenshotUrl);
1015
98
    surfaceManager->notifySurfaceCreated(surface);
99
    surfaceManager->notifySurfaceCreated(surface);
1016
99
100
1017
@@ -122,7 +123,9 @@
1018
122
    auto surface = surfaceManager->createSurface(surfaceName,
123
    auto surface = surfaceManager->createSurface(surfaceName,
1019
123
           Mir::NormalType,
124
           Mir::NormalType,
1020
124
           fullscreen() ? Mir::FullscreenState : Mir::RestoredState,
125
           fullscreen() ? Mir::FullscreenState : Mir::RestoredState,
1022
125
           m_screenshotFileName);
126
            nullptr, /* parentSurface */
1023
127
           m_screenshotFileName,
1024
128
           m_qmlFilePath);
1025
126
129
1026
127
    surface->setShellChrome(m_shellChrome);
130
    surface->setShellChrome(m_shellChrome);
1027
128
131
1028
@@ -201,6 +204,11 @@
1029
201
    }
204
    }
1030
202
}
205
}
1031
203
206
1032
207
void ApplicationInfo::setQmlFilename(const QString &qmlFilename)
1033
208
{
1034
209
    m_qmlFilePath = QString("qrc:///Unity/Application/%1").arg(qmlFilename);
1035
210
}
1036
211
1037
204
void ApplicationInfo::setName(const QString &value)
212
void ApplicationInfo::setName(const QString &value)
1038
205
{
213
{
1039
206
    if (value != m_name) {
214
    if (value != m_name) {
1040
207
215
1041
=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
1042
--- tests/mocks/Unity/Application/ApplicationInfo.h	2016-12-23 11:05:09 +0000
1043
+++ tests/mocks/Unity/Application/ApplicationInfo.h	2017-01-19 15:00:39 +0000
1044
@@ -29,6 +29,7 @@
1045
29
29
1046
30
#include <QList>
30
#include <QList>
1047
31
#include <QTimer>
31
#include <QTimer>
1048
32
#include <QUrl>
1049
32
33
1050
33
using namespace unity::shell::application;
34
using namespace unity::shell::application;
1051
34
35
1052
@@ -58,6 +59,7 @@
1053
58
59
1054
59
    void setIconId(const QString &iconId);
60
    void setIconId(const QString &iconId);
1055
60
    void setScreenshotId(const QString &screenshotId);
61
    void setScreenshotId(const QString &screenshotId);
1056
62
    void setQmlFilename(const QString &);
1057
61
63
1058
62
    void setAppId(const QString &value) { m_appId = value; }
64
    void setAppId(const QString &value) { m_appId = value; }
1059
63
    QString appId() const override { return m_appId; }
65
    QString appId() const override { return m_appId; }
1060
@@ -152,6 +154,7 @@
1061
152
    QList<MirSurface*> m_closingSurfaces;
154
    QList<MirSurface*> m_closingSurfaces;
1062
153
    bool m_manualSurfaceCreation{false};
155
    bool m_manualSurfaceCreation{false};
1063
154
    Mir::ShellChrome m_shellChrome{Mir::NormalChrome};
156
    Mir::ShellChrome m_shellChrome{Mir::NormalChrome};
1064
157
    QUrl m_qmlFilePath;
1065
155
};
158
};
1066
156
159
1067
157
Q_DECLARE_METATYPE(ApplicationInfo*)
160
Q_DECLARE_METATYPE(ApplicationInfo*)
1068
158
161
1069
=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
1070
--- tests/mocks/Unity/Application/ApplicationManager.cpp	2016-12-07 11:19:17 +0000
1071
+++ tests/mocks/Unity/Application/ApplicationManager.cpp	2017-01-19 15:00:39 +0000
1072
@@ -480,6 +480,15 @@
1073
480
    application->setName("Primary Oriented");
480
    application->setName("Primary Oriented");
1074
481
    application->setSupportedOrientations(Qt::PrimaryOrientation);
481
    application->setSupportedOrientations(Qt::PrimaryOrientation);
1075
482
    m_availableApplications.append(application);
482
    m_availableApplications.append(application);
1076
483
1077
484
    application = new ApplicationInfo(this);
1078
485
    application->setAppId("kate");
1079
486
    application->setName("Kate");
1080
487
    application->setIconId("libreoffice");
1081
488
    application->setScreenshotId("libreoffice");
1082
489
    application->setQmlFilename("Kate.qml");
1083
490
    application->setIsTouchApp(false);
1084
491
    m_availableApplications.append(application);
1085
483
}
492
}
1086
484
493
1087
485
494
1088
486
495
1089
=== modified file 'tests/mocks/Unity/Application/MirSurface.cpp'
1090
--- tests/mocks/Unity/Application/MirSurface.cpp	2016-12-02 18:15:36 +0000
1091
+++ tests/mocks/Unity/Application/MirSurface.cpp	2017-01-19 15:00:39 +0000
1092
@@ -74,6 +74,7 @@
1093
74
MirSurface::MirSurface(const QString& name,
74
MirSurface::MirSurface(const QString& name,
1094
75
        Mir::Type type,
75
        Mir::Type type,
1095
76
        Mir::State state,
76
        Mir::State state,
1096
77
        MirSurface *parentSurface,
1097
77
        const QUrl& screenshot,
78
        const QUrl& screenshot,
1098
78
        const QUrl &qmlFilePath)
79
        const QUrl &qmlFilePath)
1099
79
    : unity::shell::application::MirSurfaceInterface(nullptr)
80
    : unity::shell::application::MirSurfaceInterface(nullptr)
1100
@@ -90,6 +91,8 @@
1101
90
    , m_height(-1)
91
    , m_height(-1)
1102
91
    , m_slowToResize(false)
92
    , m_slowToResize(false)
1103
92
    , m_shellChrome(Mir::NormalChrome)
93
    , m_shellChrome(Mir::NormalChrome)
1104
94
    , m_parentSurface(parentSurface)
1105
95
    , m_childSurfaceList(new MirSurfaceListModel(this))
1106
93
{
96
{
1107
94
    DEBUG_MSG("state=" << stateToStr(state));
97
    DEBUG_MSG("state=" << stateToStr(state));
1108
95
98
1109
@@ -493,6 +496,36 @@
1110
493
    }
496
    }
1111
494
}
497
}
1112
495
498
1113
499
void MirSurface::openMenu(qreal x, qreal y, qreal width, qreal height)
1114
500
{
1115
501
    auto *menu = SurfaceManager::instance()->createSurface("menu", Mir::MenuType, Mir::HiddenState,
1116
502
            this /* parentSurface */,
1117
503
            QUrl() /* screenshot */,
1118
504
            QUrl("qrc:///Unity/Application/KateMenu.qml"));
1119
505
1120
506
    menu->setRequestedPosition(QPoint(x,y));
1121
507
    menu->resize(width, height);
1122
508
    menu->requestState(Mir::RestoredState);
1123
509
1124
510
    SurfaceManager::instance()->notifySurfaceCreated(menu);
1125
511
}
1126
512
1127
513
void MirSurface::openDialog(qreal x, qreal y, qreal width, qreal height)
1128
514
{
1129
515
    auto *dialog = SurfaceManager::instance()->createSurface("dialog", Mir::DialogType, Mir::HiddenState,
1130
516
            this /* parentSurface */,
1131
517
            QUrl() /* screenshot */,
1132
518
            QUrl("qrc:///Unity/Application/KateDialog.qml"));
1133
519
1134
520
    dialog->setRequestedPosition(QPoint(x,y));
1135
521
    dialog->resize(width, height);
1136
522
    dialog->requestState(Mir::RestoredState);
1137
523
1138
524
    SurfaceManager::instance()->notifySurfaceCreated(dialog);
1139
525
1140
526
    dialog->requestFocus();
1141
527
}
1142
528
1143
496
void MirSurface::setRequestedPosition(const QPoint &value)
529
void MirSurface::setRequestedPosition(const QPoint &value)
1144
497
{
530
{
1145
498
    if (value != m_requestedPosition) {
531
    if (value != m_requestedPosition) {
1146
@@ -505,3 +538,13 @@
1147
505
        Q_EMIT positionChanged(m_position);
538
        Q_EMIT positionChanged(m_position);
1148
506
    }
539
    }
1149
507
}
540
}
1150
541
1151
542
MirSurfaceInterface* MirSurface::parentSurface() const
1152
543
{
1153
544
    return m_parentSurface;
1154
545
}
1155
546
1156
547
MirSurfaceListInterface* MirSurface::childSurfaceList() const
1157
548
{
1158
549
    return m_childSurfaceList;
1159
550
}
1160
508
551
1161
=== modified file 'tests/mocks/Unity/Application/MirSurface.h'
1162
--- tests/mocks/Unity/Application/MirSurface.h	2016-12-03 18:41:45 +0000
1163
+++ tests/mocks/Unity/Application/MirSurface.h	2017-01-19 15:00:39 +0000
1164
@@ -45,6 +45,7 @@
1165
45
    MirSurface(const QString& name,
45
    MirSurface(const QString& name,
1166
46
            Mir::Type type,
46
            Mir::Type type,
1167
47
            Mir::State state,
47
            Mir::State state,
1168
48
            MirSurface *parentSurface,
1169
48
            const QUrl& screenshot,
49
            const QUrl& screenshot,
1170
49
            const QUrl &qmlFilePath = QUrl());
50
            const QUrl &qmlFilePath = QUrl());
1171
50
    virtual ~MirSurface();
51
    virtual ~MirSurface();
1172
@@ -94,6 +95,9 @@
1173
94
    QPoint requestedPosition() const override { return m_requestedPosition; }
95
    QPoint requestedPosition() const override { return m_requestedPosition; }
1174
95
    void setRequestedPosition(const QPoint &) override;
96
    void setRequestedPosition(const QPoint &) override;
1175
96
97
1176
98
    unity::shell::application::MirSurfaceInterface* parentSurface() const override;
1177
99
    unity::shell::application::MirSurfaceListInterface* childSurfaceList() const override;
1178
100
1179
97
    Q_INVOKABLE void close() override;
101
    Q_INVOKABLE void close() override;
1180
98
    Q_INVOKABLE void activate() override;
102
    Q_INVOKABLE void activate() override;
1181
99
103
1182
@@ -121,6 +125,9 @@
1183
121
125
1184
122
    Q_INVOKABLE virtual void setInputBounds(const QRect &boundsRect);
126
    Q_INVOKABLE virtual void setInputBounds(const QRect &boundsRect);
1185
123
127
1186
128
    Q_INVOKABLE void openMenu(qreal x, qreal y, qreal width, qreal height);
1187
129
    Q_INVOKABLE void openDialog(qreal x, qreal y, qreal width, qreal height);
1188
130
1189
124
    /////
131
    /////
1190
125
    // internal mock stuff
132
    // internal mock stuff
1191
126
133
1192
@@ -216,6 +223,10 @@
1193
216
223
1194
217
    QPoint m_position;
224
    QPoint m_position;
1195
218
    QPoint m_requestedPosition;
225
    QPoint m_requestedPosition;
1196
226
1197
227
    unity::shell::application::MirSurfaceInterface* m_parentSurface;
1198
228
1199
229
    MirSurfaceListModel *m_childSurfaceList;
1200
219
};
230
};
1201
220
231
1202
221
#endif // MOCK_MIR_SURFACE_H
232
#endif // MOCK_MIR_SURFACE_H
1203
222
233
1204
=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
1205
--- tests/mocks/Unity/Application/MirSurfaceItem.cpp	2016-12-23 11:05:09 +0000
1206
+++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	2017-01-19 15:00:39 +0000
1207
@@ -159,7 +159,9 @@
1208
159
159
1209
160
    if (m_qmlItem) {
160
    if (m_qmlItem) {
1210
161
        QQmlProperty orientationProp(m_qmlItem, "orientationAngle");
161
        QQmlProperty orientationProp(m_qmlItem, "orientationAngle");
1212
162
        orientationProp.write(QVariant::fromValue(orientationAngle()));
162
        if (orientationProp.isValid()) {
1213
163
            orientationProp.write(QVariant::fromValue(orientationAngle()));
1214
164
        }
1215
163
    }
165
    }
1216
164
}
166
}
1217
165
167
1218
@@ -167,7 +169,9 @@
1219
167
{
169
{
1220
168
    if (m_qmlItem) {
170
    if (m_qmlItem) {
1221
169
        QQmlProperty screenshotSource(m_qmlItem, "screenshotSource");
171
        QQmlProperty screenshotSource(m_qmlItem, "screenshotSource");
1223
170
        screenshotSource.write(QVariant::fromValue(screenshotUrl));
172
        if (screenshotSource.isValid()) {
1224
173
            screenshotSource.write(QVariant::fromValue(screenshotUrl));
1225
174
        }
1226
171
    }
175
    }
1227
172
}
176
}
1228
173
177
1229
@@ -193,12 +197,23 @@
1230
193
197
1231
194
    {
198
    {
1232
195
        QQmlProperty screenshotSource(m_qmlItem, "screenshotSource");
199
        QQmlProperty screenshotSource(m_qmlItem, "screenshotSource");
1234
196
        screenshotSource.write(QVariant::fromValue(m_qmlSurface->screenshotUrl()));
200
        if (screenshotSource.isValid()) {
1235
201
            screenshotSource.write(QVariant::fromValue(m_qmlSurface->screenshotUrl()));
1236
202
        }
1237
197
    }
203
    }
1238
198
204
1239
199
    {
205
    {
1240
200
        QQmlProperty orientationProp(m_qmlItem, "orientationAngle");
206
        QQmlProperty orientationProp(m_qmlItem, "orientationAngle");
1242
201
        orientationProp.write(QVariant::fromValue(orientationAngle()));
207
        if (orientationProp.isValid()) {
1243
208
            orientationProp.write(QVariant::fromValue(orientationAngle()));
1244
209
        }
1245
210
    }
1246
211
1247
212
    {
1248
213
        QQmlProperty surfaceProperty(m_qmlItem, "surface");
1249
214
        if (surfaceProperty.isValid()) {
1250
215
            surfaceProperty.write(QVariant::fromValue(m_qmlSurface));
1251
216
        }
1252
202
    }
217
    }
1253
203
}
218
}
1254
204
219
1255
205
220
1256
=== modified file 'tests/mocks/Unity/Application/MirSurfaceListModel.h'
1257
--- tests/mocks/Unity/Application/MirSurfaceListModel.h	2016-11-30 19:24:02 +0000
1258
+++ tests/mocks/Unity/Application/MirSurfaceListModel.h	2017-01-19 15:00:39 +0000
1259
@@ -44,7 +44,6 @@
1260
44
    bool contains(MirSurface *surface) const { return m_surfaceList.contains(surface); }
44
    bool contains(MirSurface *surface) const { return m_surfaceList.contains(surface); }
1261
45
45
1262
46
private:
46
private:
1263
47
    void appendSurface(MirSurface *surface);
1264
48
    void raise(MirSurface *surface);
47
    void raise(MirSurface *surface);
1265
49
    void moveSurface(int from, int to);
48
    void moveSurface(int from, int to);
1266
50
    void connectSurface(MirSurface *surface);
49
    void connectSurface(MirSurface *surface);
1267
51
50
1268
=== modified file 'tests/mocks/Unity/Application/SurfaceManager.cpp'
1269
--- tests/mocks/Unity/Application/SurfaceManager.cpp	2017-01-03 12:45:42 +0000
1270
+++ tests/mocks/Unity/Application/SurfaceManager.cpp	2017-01-19 15:00:39 +0000
1271
@@ -61,10 +61,15 @@
1272
61
MirSurface *SurfaceManager::createSurface(const QString& name,
61
MirSurface *SurfaceManager::createSurface(const QString& name,
1273
62
                                          Mir::Type type,
62
                                          Mir::Type type,
1274
63
                                          Mir::State state,
63
                                          Mir::State state,
1276
64
                                          const QUrl& screenshot)
64
                                          MirSurface *parentSurface,
1277
65
                                          const QUrl &screenshot,
1278
66
                                          const QUrl &qmlFilePath)
1279
65
{
67
{
1281
66
    MirSurface* surface = new MirSurface(name, type, state, screenshot);
68
    MirSurface* surface = new MirSurface(name, type, state, parentSurface, screenshot, qmlFilePath);
1282
67
    registerSurface(surface);
69
    registerSurface(surface);
1283
70
    if (parentSurface) {
1284
71
        static_cast<MirSurfaceListModel*>(parentSurface->childSurfaceList())->addSurface(surface);
1285
72
    }
1286
68
    return surface;
73
    return surface;
1287
69
}
74
}
1288
70
75
1289
@@ -72,12 +77,14 @@
1290
72
{
77
{
1291
73
    m_surfaces.prepend(surface);
78
    m_surfaces.prepend(surface);
1292
74
79
1299
75
    surface->setMinimumWidth(m_newSurfaceMinimumWidth);
80
    if (!surface->parentSurface()) {
1300
76
    surface->setMaximumWidth(m_newSurfaceMaximumWidth);
81
        surface->setMinimumWidth(m_newSurfaceMinimumWidth);
1301
77
    surface->setMinimumHeight(m_newSurfaceMinimumHeight);
82
        surface->setMaximumWidth(m_newSurfaceMaximumWidth);
1302
78
    surface->setMaximumHeight(m_newSurfaceMaximumHeight);
83
        surface->setMinimumHeight(m_newSurfaceMinimumHeight);
1303
79
    surface->setWidthIncrement(m_newSurfaceWidthIncrement);
84
        surface->setMaximumHeight(m_newSurfaceMaximumHeight);
1304
80
    surface->setHeightIncrement(m_newSurfaceHeightIncrement);
85
        surface->setWidthIncrement(m_newSurfaceWidthIncrement);
1305
86
        surface->setHeightIncrement(m_newSurfaceHeightIncrement);
1306
87
    }
1307
81
88
1308
82
    connect(surface, &MirSurface::stateRequested, this, [=](Mir::State state) {
89
    connect(surface, &MirSurface::stateRequested, this, [=](Mir::State state) {
1309
83
        this->onStateRequested(surface, state);
90
        this->onStateRequested(surface, state);
1310
84
91
1311
=== modified file 'tests/mocks/Unity/Application/SurfaceManager.h'
1312
--- tests/mocks/Unity/Application/SurfaceManager.h	2017-01-03 12:45:42 +0000
1313
+++ tests/mocks/Unity/Application/SurfaceManager.h	2017-01-19 15:00:39 +0000
1314
@@ -49,7 +49,9 @@
1315
49
    Q_INVOKABLE MirSurface* createSurface(const QString& name,
49
    Q_INVOKABLE MirSurface* createSurface(const QString& name,
1316
50
                                  Mir::Type type,
50
                                  Mir::Type type,
1317
51
                                  Mir::State state,
51
                                  Mir::State state,
1319
52
                                  const QUrl& screenshot);
52
                                  MirSurface *parentSurface,
1320
53
                                  const QUrl &screenshot,
1321
54
                                  const QUrl &qmlFilePath = QUrl());
1322
53
55
1323
54
56
1324
55
    void notifySurfaceCreated(unity::shell::application::MirSurfaceInterface *);
57
    void notifySurfaceCreated(unity::shell::application::MirSurfaceInterface *);
1325
56
58
1326
=== modified file 'tests/mocks/Unity/Application/VirtualKeyboard.cpp'
1327
--- tests/mocks/Unity/Application/VirtualKeyboard.cpp	2016-09-26 12:25:19 +0000
1328
+++ tests/mocks/Unity/Application/VirtualKeyboard.cpp	2017-01-19 15:00:39 +0000
1329
@@ -24,10 +24,11 @@
1330
24
24
1331
25
VirtualKeyboard::VirtualKeyboard()
25
VirtualKeyboard::VirtualKeyboard()
1332
26
    : MirSurface("input-method",
26
    : MirSurface("input-method",
1337
27
                     Mir::InputMethodType,
27
                 Mir::InputMethodType,
1338
28
                     Mir::MinimizedState,
28
                 Mir::MinimizedState,
1339
29
                     QUrl("qrc:///Unity/Application/vkb_portrait.png"),
29
                 nullptr, /* parentSurface */
1340
30
                     QUrl("qrc:///Unity/Application/VirtualKeyboard.qml"))
30
                 QUrl("qrc:///Unity/Application/vkb_portrait.png"),
1341
31
                 QUrl("qrc:///Unity/Application/VirtualKeyboard.qml"))
1342
31
{
32
{
1343
32
}
33
}
1344
33
34
1345
34
35
1346
=== added file 'tests/mocks/Unity/Application/resources/Kate.qml'
1347
--- tests/mocks/Unity/Application/resources/Kate.qml	1970-01-01 00:00:00 +0000
1348
+++ tests/mocks/Unity/Application/resources/Kate.qml	2017-01-19 15:00:39 +0000
1349
@@ -0,0 +1,49 @@
1350
1
/*
1351
2
 * Copyright (C) 2016 Canonical, Ltd.
1352
3
 *
1353
4
 * This program is free software; you can redistribute it and/or modify
1354
5
 * it under the terms of the GNU General Public License as published by
1355
6
 * the Free Software Foundation; version 3.
1356
7
 *
1357
8
 * This program is distributed in the hope that it will be useful,
1358
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1359
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1360
11
 * GNU General Public License for more details.
1361
12
 *
1362
13
 * You should have received a copy of the GNU General Public License
1363
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1364
15
 */
1365
16
1366
17
import QtQuick 2.4
1367
18
import Ubuntu.Components 1.3
1368
19
1369
20
Rectangle {
1370
21
    id: root
1371
22
    color: "white"
1372
23
    implicitWidth: width
1373
24
    implicitHeight: height
1374
25
1375
26
    property var surface
1376
27
1377
28
    Column {
1378
29
        Button {
1379
30
            text: "Open Menu"
1380
31
            property real nextY: y
1381
32
            property real menuHeight: units.gu(5)
1382
33
            onClicked: {
1383
34
                surface.openMenu(x+width, nextY, units.gu(10), menuHeight);
1384
35
                nextY += menuHeight + units.gu(.5)
1385
36
            }
1386
37
        }
1387
38
1388
39
        Button {
1389
40
            text: "Open Dialog"
1390
41
            property real dialogWidth: units.gu(30)
1391
42
            property real dialogHeight: units.gu(20)
1392
43
            onClicked: {
1393
44
                surface.openDialog(root.x+(root.width/2)-(dialogWidth/2), root.y+(root.height/2)-(dialogHeight/2),
1394
45
                                   dialogWidth, dialogHeight);
1395
46
            }
1396
47
        }
1397
48
    }
1398
49
}
1399
0
50
1400
=== added file 'tests/mocks/Unity/Application/resources/KateDialog.qml'
1401
--- tests/mocks/Unity/Application/resources/KateDialog.qml	1970-01-01 00:00:00 +0000
1402
+++ tests/mocks/Unity/Application/resources/KateDialog.qml	2017-01-19 15:00:39 +0000
1403
@@ -0,0 +1,48 @@
1404
1
/*
1405
2
 * Copyright (C) 2016 Canonical, Ltd.
1406
3
 *
1407
4
 * This program is free software; you can redistribute it and/or modify
1408
5
 * it under the terms of the GNU General Public License as published by
1409
6
 * the Free Software Foundation; version 3.
1410
7
 *
1411
8
 * This program is distributed in the hope that it will be useful,
1412
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1413
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1414
11
 * GNU General Public License for more details.
1415
12
 *
1416
13
 * You should have received a copy of the GNU General Public License
1417
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1418
15
 */
1419
16
1420
17
import QtQuick 2.4
1421
18
import Ubuntu.Components 1.3
1422
19
1423
20
Rectangle {
1424
21
    id: root
1425
22
    color: "grey"
1426
23
    implicitWidth: width
1427
24
    implicitHeight: height
1428
25
1429
26
    property var surface
1430
27
1431
28
    Text {
1432
29
        anchors.left: parent.left
1433
30
        anchors.right: parent.right
1434
31
        horizontalAlignment: Text.AlignHCenter
1435
32
        verticalAlignment: Text.AlignVCenter
1436
33
        text: "This is a child dialog."
1437
34
    }
1438
35
1439
36
    Row {
1440
37
        anchors.bottom: parent.bottom
1441
38
        anchors.right: parent.right
1442
39
        Button {
1443
40
            text: "OK"
1444
41
            onClicked: root.surface.close()
1445
42
        }
1446
43
        Button {
1447
44
            text: "Cancel"
1448
45
            onClicked: root.surface.close()
1449
46
        }
1450
47
    }
1451
48
}
1452
0
49
1453
=== added file 'tests/mocks/Unity/Application/resources/KateMenu.qml'
1454
--- tests/mocks/Unity/Application/resources/KateMenu.qml	1970-01-01 00:00:00 +0000
1455
+++ tests/mocks/Unity/Application/resources/KateMenu.qml	2017-01-19 15:00:39 +0000
1456
@@ -0,0 +1,41 @@
1457
1
/*
1458
2
 * Copyright (C) 2016 Canonical, Ltd.
1459
3
 *
1460
4
 * This program is free software; you can redistribute it and/or modify
1461
5
 * it under the terms of the GNU General Public License as published by
1462
6
 * the Free Software Foundation; version 3.
1463
7
 *
1464
8
 * This program is distributed in the hope that it will be useful,
1465
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1466
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1467
11
 * GNU General Public License for more details.
1468
12
 *
1469
13
 * You should have received a copy of the GNU General Public License
1470
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1471
15
 */
1472
16
1473
17
import QtQuick 2.4
1474
18
import Ubuntu.Components 1.3
1475
19
1476
20
Rectangle {
1477
21
    id: root
1478
22
    color: "grey"
1479
23
    implicitWidth: width
1480
24
    implicitHeight: height
1481
25
1482
26
    property var surface
1483
27
1484
28
    Text {
1485
29
        anchors.centerIn: parent
1486
30
        text: "menu"
1487
31
    }
1488
32
    MouseArea {
1489
33
        anchors.fill: parent
1490
34
        property real nextY: 0
1491
35
        onClicked: {
1492
36
            // ensure some overlap with is parent in order to visually check for nested opacity artifacts
1493
37
            root.surface.openMenu(x+(width*0.6), nextY, units.gu(10), root.height);
1494
38
            nextY += root.height
1495
39
        }
1496
40
    }
1497
41
}
1498
0
42
1499
=== modified file 'tests/mocks/Unity/Application/resources/surfaces.qrc'
1500
--- tests/mocks/Unity/Application/resources/surfaces.qrc	2015-11-05 17:59:16 +0000
1501
+++ tests/mocks/Unity/Application/resources/surfaces.qrc	2017-01-19 15:00:39 +0000
1502
@@ -1,5 +1,8 @@
1503
1
<RCC>
1
<RCC>
1504
2
    <qresource prefix="/Unity/Application">
2
    <qresource prefix="/Unity/Application">
1505
3
        <file>Kate.qml</file>
1506
4
        <file>KateDialog.qml</file>
1507
5
        <file>KateMenu.qml</file>
1508
3
        <file>VirtualKeyboard.qml</file>
6
        <file>VirtualKeyboard.qml</file>
1509
4
        <file>MirSurfaceItem.qml</file>
7
        <file>MirSurfaceItem.qml</file>
1510
5
        <file>vkb_portrait.png</file>
8
        <file>vkb_portrait.png</file>
1511
6
9
1512
=== modified file 'tests/qmltests/Stage/ApplicationCheckBox.qml'
1513
--- tests/qmltests/Stage/ApplicationCheckBox.qml	2016-11-30 19:24:02 +0000
1514
+++ tests/qmltests/Stage/ApplicationCheckBox.qml	2017-01-19 15:00:39 +0000
1515
@@ -162,7 +162,7 @@
1516
162
        }
162
        }
1517
163
    }
163
    }
1518
164
164
1520
165
    // Rows of application surfaces
165
    // Rows of top-level application surfaces
1521
166
    Repeater {
166
    Repeater {
1522
167
        model: d.application ? d.application.surfaceList : null
167
        model: d.application ? d.application.surfaceList : null
1523
168
        RowLayout {
168
        RowLayout {
1524
169
169
1525
=== modified file 'tests/qmltests/Stage/tst_WindowResizeArea.qml'
1526
--- tests/qmltests/Stage/tst_WindowResizeArea.qml	2016-12-21 16:20:58 +0000
1527
+++ tests/qmltests/Stage/tst_WindowResizeArea.qml	2017-01-19 15:00:39 +0000
1528
@@ -90,6 +90,7 @@
1529
90
                id: windowResizeArea
90
                id: windowResizeArea
1530
91
                anchors.fill: parent
91
                anchors.fill: parent
1531
92
                target: fakeWindow
92
                target: fakeWindow
1532
93
                boundsItem: bounds
1533
93
                borderThickness: units.gu(2)
94
                borderThickness: units.gu(2)
1534
94
                minWidth: units.gu(15)
95
                minWidth: units.gu(15)
1535
95
                minHeight: units.gu(10)
96
                minHeight: units.gu(10)
1536
@@ -121,7 +122,16 @@
1537
121
        active: windowLoaderCheckbox.checked
122
        active: windowLoaderCheckbox.checked
1538
122
    }
123
    }
1539
123
124
1540
125
    Item {
1541
126
        id: bounds
1542
127
        anchors.left: parent.left
1543
128
        anchors.top: parent.top
1544
129
        anchors.right: controls.left
1545
130
        anchors.bottom: parent.bottom
1546
131
    }
1547
132
1548
124
    Rectangle {
133
    Rectangle {
1549
134
        id: controls
1550
125
        anchors.right: parent.right
135
        anchors.right: parent.right
1551
126
        anchors.top: parent.top
136
        anchors.top: parent.top
1552
127
        anchors.bottom: parent.bottom
137
        anchors.bottom: parent.bottom
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2017-01-19
Michael Zanetti (community)			Needs Information on 2017-01-19
Gerry Boland (community)			Needs Information on 2017-01-19
Nick Dedekind (community)		2016-11-28	Abstain on 2017-01-18
Lukáš Tinkl (community)			Needs Information on 2016-12-16
Review via email: mp+311974@code.launchpad.net