1
=== modified file 'debian/control'
2
--- debian/control	2015-10-21 11:51:11 +0000
3
+++ debian/control	2015-11-04 14:53:37 +0000
4
@@ -29,7 +29,7 @@
5
29
               libqt5xmlpatterns5-dev,
29
               libqt5xmlpatterns5-dev,
6
30
               libsystemsettings-dev,
30
               libsystemsettings-dev,
7
31
               libudev-dev,
31
               libudev-dev,
9
32
               libunity-api-dev (>= 7.101),
32
               libunity-api-dev (>= 7.102),
10
33
               libusermetricsoutput1-dev,
33
               libusermetricsoutput1-dev,
11
34
               libxcb1-dev,
34
               libxcb1-dev,
12
35
               pkg-config,
35
               pkg-config,
13
36
36
14
=== modified file 'qml/Stages/DesktopStage.qml'
15
--- qml/Stages/DesktopStage.qml	2015-11-04 14:53:36 +0000
16
+++ qml/Stages/DesktopStage.qml	2015-11-04 14:53:37 +0000
17
@@ -68,6 +68,22 @@
18
68
            var index = indexOf(focusedAppId);
68
            var index = indexOf(focusedAppId);
19
69
            return index >= 0 && index < appRepeater.count ? appRepeater.itemAt(index) : null
69
            return index >= 0 && index < appRepeater.count ? appRepeater.itemAt(index) : null
20
70
        }
70
        }
21
71
        property int foregroundMaximizedAppIdIndex: -1
22
72
23
73
        function updateForegroundMaximizedApp() {
24
74
            for (var i = 0; i < appRepeater.count; i++) {
25
75
                var item = appRepeater.itemAt(i);
26
76
27
77
                if (item && item.visuallyMaximized) {
28
78
                    var app = ApplicationManager.get(i);
29
79
                    if (app) {
30
80
                        foregroundMaximizedAppIdIndex = i;
31
81
                        return;
32
82
                    }
33
83
                }
34
84
            }
35
85
            foregroundMaximizedAppIdIndex = -1;
36
86
        }
37
71
87
38
72
        function indexOf(appId) {
88
        function indexOf(appId) {
39
73
            for (var i = 0; i < ApplicationManager.count; i++) {
89
            for (var i = 0; i < ApplicationManager.count; i++) {
40
@@ -114,8 +130,12 @@
41
114
            model: ApplicationManager
130
            model: ApplicationManager
42
115
            objectName: "appRepeater"
131
            objectName: "appRepeater"
43
116
132
44
133
            onItemAdded: priv.updateForegroundMaximizedApp()
45
134
            onItemRemoved: priv.updateForegroundMaximizedApp()
46
135
47
117
            delegate: FocusScope {
136
            delegate: FocusScope {
48
118
                id: appDelegate
137
                id: appDelegate
49
138
                objectName: "stageDelegate_" + model.appId
50
119
                z: ApplicationManager.count - index
139
                z: ApplicationManager.count - index
51
120
                y: units.gu(3)
140
                y: units.gu(3)
52
121
                width: units.gu(60)
141
                width: units.gu(60)
53
@@ -126,12 +146,25 @@
54
126
                property bool minimized: false
146
                property bool minimized: false
55
127
                property bool animationsEnabled: true
147
                property bool animationsEnabled: true
56
128
148
57
149
                property bool visuallyMaximized: false
58
150
                property bool visuallyMinimized: false
59
151
60
129
                onFocusChanged: {
152
                onFocusChanged: {
61
130
                    if (focus && ApplicationManager.focusedApplicationId !== model.appId) {
153
                    if (focus && ApplicationManager.focusedApplicationId !== model.appId) {
62
131
                        ApplicationManager.focusApplication(model.appId);
154
                        ApplicationManager.focusApplication(model.appId);
63
132
                    }
155
                    }
64
133
                }
156
                }
65
134
157
66
158
                onZChanged: priv.updateForegroundMaximizedApp()
67
159
                onVisuallyMaximizedChanged: priv.updateForegroundMaximizedApp()
68
160
69
161
                visible: !visuallyMinimized &&
70
162
                         !greeter.fullyShown &&
71
163
                         (priv.foregroundMaximizedAppIdIndex === -1 || priv.foregroundMaximizedAppIdIndex >= index) ||
72
164
                         (spread.state == "altTab" && index === spread.highlightedIndex)
73
165
74
166
                onVisibleChanged: console.log("VISIBLE", model.appId, visible)
75
167
76
135
                Binding {
168
                Binding {
77
136
                    target: ApplicationManager.get(index)
169
                    target: ApplicationManager.get(index)
78
137
                    property: "requestedState"
170
                    property: "requestedState"
79
@@ -161,23 +194,60 @@
80
161
194
81
162
                states: [
195
                states: [
82
163
                    State {
196
                    State {
84
164
                        name: "normal"; when: !appDelegate.maximized && !appDelegate.minimized
197
                        name: "normal";
85
198
                        when: !appDelegate.maximized && !appDelegate.minimized
86
199
                        PropertyChanges {
87
200
                            target: appDelegate;
88
201
                            visuallyMinimized: false;
89
202
                            visuallyMaximized: false
90
203
                        }
91
165
                    },
204
                    },
92
166
                    State {
205
                    State {
93
167
                        name: "maximized"; when: appDelegate.maximized
206
                        name: "maximized"; when: appDelegate.maximized
95
168
                        PropertyChanges { target: appDelegate; x: 0; y: 0; width: root.width; height: root.height }
207
                        PropertyChanges {
96
208
                            target: appDelegate;
97
209
                            x: 0; y: 0;
98
210
                            width: root.width; height: root.height;
99
211
                            visuallyMinimized: false;
100
212
                            visuallyMaximized: true
101
213
                        }
102
169
                    },
214
                    },
103
170
                    State {
215
                    State {
104
171
                        name: "minimized"; when: appDelegate.minimized
216
                        name: "minimized"; when: appDelegate.minimized
106
172
                        PropertyChanges { target: appDelegate; x: -appDelegate.width / 2; scale: units.gu(5) / appDelegate.width; opacity: 0 }
217
                        PropertyChanges {
107
218
                            target: appDelegate;
108
219
                            x: -appDelegate.width / 2;
109
220
                            scale: units.gu(5) / appDelegate.width;
110
221
                            opacity: 0
111
222
                            visuallyMinimized: true;
112
223
                            visuallyMaximized: false
113
224
                        }
114
173
                    }
225
                    }
115
174
                ]
226
                ]
116
175
                transitions: [
227
                transitions: [
117
176
                    Transition {
228
                    Transition {
122
177
                        from: "maximized,minimized,normal,"
229
                        to: "normal"
123
178
                        to: "maximized,minimized,normal,"
230
                        enabled: appDelegate.animationsEnabled
124
179
                        enabled: appDelegate.animationsEnabled
231
                        PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
125
180
                        PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale" }
232
                        PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale,opacity" }
126
233
                    },
127
234
                    Transition {
128
235
                        to: "maximized"
129
236
                        enabled: appDelegate.animationsEnabled
130
237
                        PropertyAction { target: appDelegate; property: "visuallyMinimized" }
131
238
                        SequentialAnimation {
132
239
                            PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale,opacity" }
133
240
                            PropertyAction { target: appDelegate; property: "visuallyMaximized" }
134
241
                        }
135
242
                    },
136
243
                    Transition {
137
244
                        to: "minimized"
138
245
                        enabled: appDelegate.animationsEnabled
139
246
                        PropertyAction { target: appDelegate; property: "visuallyMaximized" }
140
247
                        SequentialAnimation {
141
248
                            PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale,opacity" }
142
249
                            PropertyAction { target: appDelegate; property: "visuallyMinimized" }
143
250
                        }
144
181
                    },
251
                    },
145
182
                    Transition {
252
                    Transition {
146
183
                        from: ""
253
                        from: ""
147
@@ -223,7 +293,7 @@
148
223
                    focus: true
293
                    focus: true
149
224
294
150
225
                    onClose: ApplicationManager.stopApplication(model.appId)
295
                    onClose: ApplicationManager.stopApplication(model.appId)
152
226
                    onMaximize: appDelegate.maximize()
296
                    onMaximize: appDelegate.maximized ? appDelegate.unmaximize() : appDelegate.maximize()
153
227
                    onMinimize: appDelegate.minimize()
297
                    onMinimize: appDelegate.minimize()
154
228
                    onDecorationPressed: { ApplicationManager.focusApplication(model.appId) }
298
                    onDecorationPressed: { ApplicationManager.focusApplication(model.appId) }
155
229
                }
299
                }
156
230
300
157
=== modified file 'qml/Stages/PhoneStage.qml'
158
--- qml/Stages/PhoneStage.qml	2015-11-04 14:53:36 +0000
159
+++ qml/Stages/PhoneStage.qml	2015-11-04 14:53:37 +0000
160
@@ -20,6 +20,7 @@
161
20
import Unity.Application 0.1
20
import Unity.Application 0.1
162
21
import Unity.Session 0.1
21
import Unity.Session 0.1
163
22
import Utils 0.1
22
import Utils 0.1
164
23
import Powerd 0.1
165
23
import "../Components"
24
import "../Components"
166
24
25
167
25
AbstractStage {
26
AbstractStage {
168
@@ -182,7 +183,8 @@
169
182
            }
183
            }
170
183
        }
184
        }
171
184
185
173
185
        property bool focusedAppDelegateIsDislocated: focusedAppDelegate && focusedAppDelegate.x !== 0
186
        property bool focusedAppDelegateIsDislocated: focusedAppDelegate &&
174
187
                                                      (focusedAppDelegate.x !== 0 || focusedAppDelegate.xBehavior.running)
175
186
188
176
187
        function indexOf(appId) {
189
        function indexOf(appId) {
177
188
            for (var i = 0; i < root.applicationManager.count; i++) {
190
            for (var i = 0; i < root.applicationManager.count; i++) {
178
@@ -473,7 +475,6 @@
179
473
475
180
474
                    property var xBehavior: xBehavior
476
                    property var xBehavior: xBehavior
181
475
                    Behavior on x {
477
                    Behavior on x {
182
476
                        id: xBehavior
183
477
                        enabled: root.spreadEnabled &&
478
                        enabled: root.spreadEnabled &&
184
478
                                 !spreadView.active &&
479
                                 !spreadView.active &&
185
479
                                 !snapAnimation.running &&
480
                                 !snapAnimation.running &&
186
@@ -481,6 +482,7 @@
187
481
                                 priv.animateX &&
482
                                 priv.animateX &&
188
482
                                 !root.beingResized
483
                                 !root.beingResized
189
483
                        UbuntuNumberAnimation {
484
                        UbuntuNumberAnimation {
190
485
                            id: xBehavior
191
484
                            duration: UbuntuAnimation.BriskDuration
486
                            duration: UbuntuAnimation.BriskDuration
192
485
                        }
487
                        }
193
486
                    }
488
                    }
194
@@ -520,9 +522,18 @@
195
520
                        return progress;
522
                        return progress;
196
521
                    }
523
                    }
197
522
524
201
523
                    // Hiding tiles when their progress is negative or reached the maximum
525
                    // Hide tile when progress is such that it will be off screen.
202
524
                    visible: (progress >= 0 && progress < 1.7)
526
                    property bool occluded: {
203
525
                            || (isDash && priv.focusedAppDelegateIsDislocated)
527
                        if (spreadView.active && (progress >= 0 && progress < 1.7)) return false;
204
528
                        else if (!spreadView.active && isFocused) return false;
205
529
                        else if (xBehavior.running) return false;
206
530
                        else if (z <= 1 && priv.focusedAppDelegateIsDislocated) return false;
207
531
                        return true;
208
532
                    }
209
533
210
534
                    visible: Powerd.status == Powerd.On &&
211
535
                             !greeter.fullyShown &&
212
536
                             !occluded
213
526
537
214
527
                    shellOrientationAngle: root.shellOrientationAngle
538
                    shellOrientationAngle: root.shellOrientationAngle
215
528
                    shellOrientation: root.shellOrientation
539
                    shellOrientation: root.shellOrientation
216
529
540
217
=== modified file 'qml/Stages/TabletStage.qml'
218
--- qml/Stages/TabletStage.qml	2015-11-04 14:53:36 +0000
219
+++ qml/Stages/TabletStage.qml	2015-11-04 14:53:37 +0000
220
@@ -1,4 +1,4 @@
222
1
/*
1
/*
223
2
 * Copyright (C) 2014-2015 Canonical, Ltd.
2
 * Copyright (C) 2014-2015 Canonical, Ltd.
224
3
 *
3
 *
225
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
226
@@ -19,6 +19,7 @@
227
19
import Ubuntu.Gestures 0.1
19
import Ubuntu.Gestures 0.1
228
20
import Unity.Application 0.1
20
import Unity.Application 0.1
229
21
import Utils 0.1
21
import Utils 0.1
230
22
import Powerd 0.1
231
22
import "../Components"
23
import "../Components"
232
23
24
233
24
AbstractStage {
25
AbstractStage {
234
@@ -146,6 +147,8 @@
235
146
            }
147
            }
236
147
        }
148
        }
237
148
149
238
150
        property bool focusedAppDelegateIsDislocated: focusedAppDelegate &&
239
151
                                                      (focusedAppDelegate.dragOffset !== 0 || focusedAppDelegate.xTranslateAnimating)
240
149
        function indexOf(appId) {
152
        function indexOf(appId) {
241
150
            for (var i = 0; i < ApplicationManager.count; i++) {
153
            for (var i = 0; i < ApplicationManager.count; i++) {
242
151
                if (ApplicationManager.get(i).appId == appId) {
154
                if (ApplicationManager.get(i).appId == appId) {
243
@@ -659,6 +662,19 @@
244
659
                        return tileProgress;
662
                        return tileProgress;
245
660
                    }
663
                    }
246
661
664
247
665
                    // TODO: Hiding tile when progress is such that it will be off screen.
248
666
                    property bool occluded: {
249
667
                        if (spreadView.active) return false;
250
668
                        else if (spreadTile.active) return false;
251
669
                        else if (xTranslateAnimating) return false;
252
670
                        else if (z <= 1 && priv.focusedAppDelegateIsDislocated) return false;
253
671
                        return true;
254
672
                    }
255
673
256
674
                    visible: Powerd.status == Powerd.On &&
257
675
                             !greeter.fullyShown &&
258
676
                             !occluded
259
677
260
662
                    animatedProgress: {
678
                    animatedProgress: {
261
663
                        if (spreadView.phase == 0 && (spreadTile.active || spreadView.nextInStack == index)) {
679
                        if (spreadView.phase == 0 && (spreadTile.active || spreadView.nextInStack == index)) {
262
664
                            if (progress < spreadView.positionMarker1) {
680
                            if (progress < spreadView.positionMarker1) {
263
665
681
264
=== modified file 'qml/Stages/TransformedTabletSpreadDelegate.qml'
265
--- qml/Stages/TransformedTabletSpreadDelegate.qml	2015-03-06 04:44:11 +0000
266
+++ qml/Stages/TransformedTabletSpreadDelegate.qml	2015-11-04 14:53:37 +0000
267
@@ -48,6 +48,7 @@
268
48
    property bool isInSideStage: false
48
    property bool isInSideStage: false
269
49
49
270
50
    property int dragOffset: 0
50
    property int dragOffset: 0
271
51
    readonly property alias xTranslateAnimating: xTranslateAnimation.running
272
51
52
273
52
    dropShadow: spreadView.active ||
53
    dropShadow: spreadView.active ||
274
53
                (active
54
                (active
275
@@ -144,6 +145,7 @@
276
144
                     spreadView.animateX &&
145
                     spreadView.animateX &&
277
145
                     !spreadView.beingResized
146
                     !spreadView.beingResized
278
146
            UbuntuNumberAnimation {
147
            UbuntuNumberAnimation {
279
148
                id: xTranslateAnimation
280
147
                duration: UbuntuAnimation.FastDuration
149
                duration: UbuntuAnimation.FastDuration
281
148
            }
150
            }
282
149
        }
151
        }
283
150
152
284
=== modified file 'tests/mocks/Unity/Application/MirSurface.cpp'
285
--- tests/mocks/Unity/Application/MirSurface.cpp	2015-09-25 12:13:13 +0000
286
+++ tests/mocks/Unity/Application/MirSurface.cpp	2015-11-04 14:53:37 +0000
287
@@ -31,7 +31,7 @@
288
31
    , m_screenshotUrl(screenshot)
31
    , m_screenshotUrl(screenshot)
289
32
    , m_qmlFilePath(qmlFilePath)
32
    , m_qmlFilePath(qmlFilePath)
290
33
    , m_live(true)
33
    , m_live(true)
292
34
    , m_viewCount(0)
34
    , m_visible(true)
293
35
    , m_activeFocus(false)
35
    , m_activeFocus(false)
294
36
    , m_width(-1)
36
    , m_width(-1)
295
37
    , m_height(-1)
37
    , m_height(-1)
296
@@ -73,6 +73,11 @@
297
73
    return m_live;
73
    return m_live;
298
74
}
74
}
299
75
75
300
76
bool MirSurface::visible() const
301
77
{
302
78
    return m_visible;
303
79
}
304
80
305
76
void MirSurface::setLive(bool live)
81
void MirSurface::setLive(bool live)
306
77
{
82
{
307
78
//    qDebug().nospace() << "MirSurface::setLive("<<live<<") " << name();
83
//    qDebug().nospace() << "MirSurface::setLive("<<live<<") " << name();
308
@@ -82,7 +87,7 @@
309
82
    m_live = live;
87
    m_live = live;
310
83
    Q_EMIT liveChanged(live);
88
    Q_EMIT liveChanged(live);
311
84
89
313
85
    if (!m_live && m_viewCount == 0) {
90
    if (!m_live && m_views.count() == 0) {
314
86
        deleteLater();
91
        deleteLater();
315
87
    }
92
    }
316
88
}
93
}
317
@@ -120,27 +125,49 @@
318
120
    Q_EMIT orientationAngleChanged(angle);
125
    Q_EMIT orientationAngleChanged(angle);
319
121
}
126
}
320
122
127
322
123
void MirSurface::incrementViewCount()
128
323
129
324
130
void MirSurface::registerView(qintptr viewId)
325
124
{
131
{
328
125
    ++m_viewCount;
132
    m_views.insert(viewId, MirSurface::View{false});
329
126
//    qDebug().nospace() << "MirSurface::incrementViewCount() viewCount(after)=" << m_viewCount << " " << name();
133
//    qDebug().nospace() << "MirSurface[" << name() << "]::registerView(" << viewId << ")"
330
134
//                                      << " after=" << m_views.count();
331
127
}
135
}
332
128
136
334
129
void MirSurface::decrementViewCount()
137
void MirSurface::unregisterView(qintptr viewId)
335
130
{
138
{
342
131
    --m_viewCount;
139
//    qDebug().nospace() << "MirSurface[" << name() << "]::unregisterView(" << viewId << ")"
343
132
//    qDebug().nospace() << "MirSurface::decrementViewCount() viewCount(after)=" << m_viewCount << " " << name();
140
//                                      << " after=" << m_views.count() << " live=" << m_live;
344
133
141
    m_views.remove(viewId);
345
134
    Q_ASSERT(m_viewCount >= 0);
142
    if (!m_live && m_views.count() == 0) {
340
135
341
136
    if (!m_live && m_viewCount == 0) {
346
137
        deleteLater();
143
        deleteLater();
347
138
    }
144
    }
353
139
}
145
    updateVisibility();
354
140
146
}
355
141
int MirSurface::viewCount() const
147
356
142
{
148
void MirSurface::setViewVisibility(qintptr viewId, bool visible)
357
143
    return m_viewCount;
149
{
358
150
    if (!m_views.contains(viewId)) return;
359
151
360
152
    m_views[viewId].visible = visible;
361
153
    updateVisibility();
362
154
}
363
155
364
156
void MirSurface::updateVisibility()
365
157
{
366
158
    bool newVisible = false;
367
159
    QHashIterator<qintptr, View> i(m_views);
368
160
    while (i.hasNext()) {
369
161
        i.next();
370
162
        newVisible |= i.value().visible;
371
163
    }
372
164
373
165
    if (newVisible != visible()) {
374
166
//        qDebug().nospace() << "MirSurface[" << name() << "]::updateVisibility(" << newVisible << ")";
375
167
376
168
        m_visible = newVisible;
377
169
        Q_EMIT visibleChanged(m_visible);
378
170
    }
379
144
}
171
}
380
145
172
381
146
bool MirSurface::activeFocus() const
173
bool MirSurface::activeFocus() const
382
147
174
383
=== modified file 'tests/mocks/Unity/Application/MirSurface.h'
384
--- tests/mocks/Unity/Application/MirSurface.h	2015-09-02 10:35:16 +0000
385
+++ tests/mocks/Unity/Application/MirSurface.h	2015-11-04 14:53:37 +0000
386
@@ -19,6 +19,7 @@
387
19
19
388
20
#include <QObject>
20
#include <QObject>
389
21
#include <QUrl>
21
#include <QUrl>
390
22
#include <QHash>
391
22
23
392
23
// unity-api
24
// unity-api
393
24
#include <unity/shell/application/MirSurfaceInterface.h>
25
#include <unity/shell/application/MirSurfaceInterface.h>
394
@@ -58,6 +59,8 @@
395
58
59
396
59
    bool live() const override;
60
    bool live() const override;
397
60
61
398
62
    bool visible() const override;
399
63
400
61
    Mir::OrientationAngle orientationAngle() const override;
64
    Mir::OrientationAngle orientationAngle() const override;
401
62
    void setOrientationAngle(Mir::OrientationAngle) override;
65
    void setOrientationAngle(Mir::OrientationAngle) override;
402
63
66
403
@@ -66,9 +69,10 @@
404
66
69
405
67
    Q_INVOKABLE void setLive(bool live);
70
    Q_INVOKABLE void setLive(bool live);
406
68
71
410
69
    void incrementViewCount();
72
    void registerView(qintptr viewId);
411
70
    void decrementViewCount();
73
    void unregisterView(qintptr viewId);
412
71
    int viewCount() const;
74
    void setViewVisibility(qintptr viewId, bool visible);
413
75
    int viewCount() const { return m_views.count(); }
414
72
76
415
73
    int width() const;
77
    int width() const;
416
74
    int height() const;
78
    int height() const;
417
@@ -97,6 +101,8 @@
418
97
    void activeFocusChanged(bool);
101
    void activeFocusChanged(bool);
419
98
102
420
99
private:
103
private:
421
104
    void updateVisibility();
422
105
423
100
    const QString m_name;
106
    const QString m_name;
424
101
    const Mir::Type m_type;
107
    const Mir::Type m_type;
425
102
    Mir::State m_state;
108
    Mir::State m_state;
426
@@ -104,10 +110,14 @@
427
104
    QUrl m_screenshotUrl;
110
    QUrl m_screenshotUrl;
428
105
    QUrl m_qmlFilePath;
111
    QUrl m_qmlFilePath;
429
106
    bool m_live;
112
    bool m_live;
431
107
    int m_viewCount;
113
    bool m_visible;
432
108
    bool m_activeFocus;
114
    bool m_activeFocus;
433
109
    int m_width;
115
    int m_width;
434
110
    int m_height;
116
    int m_height;
435
117
    struct View {
436
118
        bool visible;
437
119
    };
438
120
    QHash<qintptr, View> m_views;
439
111
};
121
};
440
112
122
441
113
#endif // MOCK_MIR_SURFACE_H
123
#endif // MOCK_MIR_SURFACE_H
442
114
124
443
=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
444
--- tests/mocks/Unity/Application/MirSurfaceItem.cpp	2015-09-25 12:13:13 +0000
445
+++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	2015-11-04 14:53:37 +0000
446
@@ -44,6 +44,8 @@
447
44
        Qt::ExtraButton5 | Qt::ExtraButton6 | Qt::ExtraButton7 | Qt::ExtraButton8 |
44
        Qt::ExtraButton5 | Qt::ExtraButton6 | Qt::ExtraButton7 | Qt::ExtraButton8 |
448
45
        Qt::ExtraButton9 | Qt::ExtraButton10 | Qt::ExtraButton11 |
45
        Qt::ExtraButton9 | Qt::ExtraButton10 | Qt::ExtraButton11 |
449
46
        Qt::ExtraButton12 | Qt::ExtraButton13);
46
        Qt::ExtraButton12 | Qt::ExtraButton13);
450
47
451
48
    connect(this, &QQuickItem::visibleChanged, this, &MirSurfaceItem::updateMirSurfaceVisibility);
452
47
}
49
}
453
48
50
454
49
MirSurfaceItem::~MirSurfaceItem()
51
MirSurfaceItem::~MirSurfaceItem()
455
@@ -194,17 +196,18 @@
456
194
        m_qmlContentComponent = nullptr;
196
        m_qmlContentComponent = nullptr;
457
195
197
458
196
        disconnect(m_qmlSurface, nullptr, this, nullptr);
198
        disconnect(m_qmlSurface, nullptr, this, nullptr);
460
197
        m_qmlSurface->decrementViewCount();
199
        m_qmlSurface->unregisterView((qintptr)this);
461
198
    }
200
    }
462
199
201
463
200
    m_qmlSurface = static_cast<MirSurface*>(surface);
202
    m_qmlSurface = static_cast<MirSurface*>(surface);
464
201
203
465
202
    if (m_qmlSurface) {
204
    if (m_qmlSurface) {
467
203
        m_qmlSurface->incrementViewCount();
205
        m_qmlSurface->registerView((qintptr)this);
468
204
206
469
205
        m_qmlSurface->setActiveFocus(hasActiveFocus());
207
        m_qmlSurface->setActiveFocus(hasActiveFocus());
470
206
208
471
207
        updateSurfaceSize();
209
        updateSurfaceSize();
472
210
        updateMirSurfaceVisibility();
473
208
211
474
209
        connect(m_qmlSurface, &MirSurface::orientationAngleChanged, this, &MirSurfaceItem::orientationAngleChanged);
212
        connect(m_qmlSurface, &MirSurface::orientationAngleChanged, this, &MirSurfaceItem::orientationAngleChanged);
475
210
        connect(m_qmlSurface, &MirSurface::screenshotUrlChanged, this, &MirSurfaceItem::updateScreenshot);
213
        connect(m_qmlSurface, &MirSurface::screenshotUrlChanged, this, &MirSurfaceItem::updateScreenshot);
476
@@ -253,6 +256,13 @@
477
253
    }
256
    }
478
254
}
257
}
479
255
258
480
259
void MirSurfaceItem::updateMirSurfaceVisibility()
481
260
{
482
261
    if (!m_qmlSurface) return;
483
262
484
263
    m_qmlSurface->setViewVisibility((qintptr)this, isVisible());
485
264
}
486
265
487
256
void MirSurfaceItem::setConsumesInput(bool value)
266
void MirSurfaceItem::setConsumesInput(bool value)
488
257
{
267
{
489
258
    if (m_consumesInput != value) {
268
    if (m_consumesInput != value) {
490
259
269
491
=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.h'
492
--- tests/mocks/Unity/Application/MirSurfaceItem.h	2015-09-19 07:37:52 +0000
493
+++ tests/mocks/Unity/Application/MirSurfaceItem.h	2015-11-04 14:53:37 +0000
494
@@ -87,6 +87,7 @@
495
87
private Q_SLOTS:
87
private Q_SLOTS:
496
88
    void onComponentStatusChanged(QQmlComponent::Status status);
88
    void onComponentStatusChanged(QQmlComponent::Status status);
497
89
    void updateScreenshot(QUrl screenshot);
89
    void updateScreenshot(QUrl screenshot);
498
90
    void updateMirSurfaceVisibility();
499
90
91
500
91
private:
92
private:
501
92
    void createQmlContentItem();
93
    void createQmlContentItem();
502
93
94
503
=== modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
504
--- tests/qmltests/Stages/tst_DesktopStage.qml	2015-09-17 12:25:29 +0000
505
+++ tests/qmltests/Stages/tst_DesktopStage.qml	2015-11-04 14:53:37 +0000
506
@@ -23,24 +23,31 @@
507
23
import Utils 0.1
23
import Utils 0.1
508
24
24
509
25
import "../../../qml/Stages"
25
import "../../../qml/Stages"
510
26
import "../../../qml/Components"
511
26
27
512
27
Item {
28
Item {
513
28
    id: root
29
    id: root
514
29
    width:  desktopStageLoader.width + controls.width
30
    width:  desktopStageLoader.width + controls.width
515
30
    height: desktopStageLoader.height
31
    height: desktopStageLoader.height
516
31
32
517
33
    property var greeter: { fullyShown: true }
518
34
519
32
    Binding {
35
    Binding {
520
33
        target: MouseTouchAdaptor
36
        target: MouseTouchAdaptor
521
34
        property: "enabled"
37
        property: "enabled"
522
35
        value: false
38
        value: false
523
36
    }
39
    }
524
37
40
526
38
    Component.onCompleted: {
41
    Component.onCompleted: resetGeometry()
527
42
528
43
    function resetGeometry() {
529
39
        // ensures apps which are tested decorations are in view.
44
        // ensures apps which are tested decorations are in view.
530
45
        WindowStateStorage.clear();
531
40
        WindowStateStorage.geometry = {
46
        WindowStateStorage.geometry = {
532
41
            'unity8-dash': Qt.rect(0, units.gu(3), units.gu(50), units.gu(40)),
47
            'unity8-dash': Qt.rect(0, units.gu(3), units.gu(50), units.gu(40)),
533
42
            'dialer-app': Qt.rect(units.gu(51), units.gu(3), units.gu(50), units.gu(40)),
48
            'dialer-app': Qt.rect(units.gu(51), units.gu(3), units.gu(50), units.gu(40)),
534
43
            'camera-app': Qt.rect(0, units.gu(44), units.gu(50), units.gu(40)),
49
            'camera-app': Qt.rect(0, units.gu(44), units.gu(50), units.gu(40)),
535
50
            'gallery-app': Qt.rect(units.gu(51), units.gu(44), units.gu(50), units.gu(40))
536
44
        }
51
        }
537
45
    }
52
    }
538
46
53
539
@@ -61,6 +68,7 @@
540
61
                Component.onDestruction: {
68
                Component.onDestruction: {
541
62
                    desktopStageLoader.itemDestroyed = true;
69
                    desktopStageLoader.itemDestroyed = true;
542
63
                }
70
                }
543
71
                orientations: Orientations {}
544
64
            }
72
            }
545
65
        }
73
        }
546
66
    }
74
    }
547
@@ -110,14 +118,14 @@
548
110
118
549
111
            desktopStageLoader.active = true;
119
            desktopStageLoader.active = true;
550
112
            tryCompare(desktopStageLoader, "status", Loader.Ready);
120
            tryCompare(desktopStageLoader, "status", Loader.Ready);
551
121
            root.resetGeometry();
552
113
        }
122
        }
553
114
123
554
115
        function killAllRunningApps() {
124
        function killAllRunningApps() {
558
116
            while (ApplicationManager.count > 1) {
125
            while (ApplicationManager.count > 0) {
559
117
                var appIndex = ApplicationManager.get(0).appId == "unity8-dash" ? 1 : 0
126
                ApplicationManager.stopApplication(ApplicationManager.get(0).appId);
557
118
                ApplicationManager.stopApplication(ApplicationManager.get(appIndex).appId);
560
119
            }
127
            }
562
120
            compare(ApplicationManager.count, 1)
128
            compare(ApplicationManager.count, 0)
563
121
        }
129
        }
564
122
130
565
123
        function waitUntilAppSurfaceShowsUp(appId) {
131
        function waitUntilAppSurfaceShowsUp(appId) {
566
@@ -210,5 +218,73 @@
567
210
            tap(toAppDecoration);
218
            tap(toAppDecoration);
568
211
            tryCompare(ApplicationManager.findApplication(data.apps[data.focusTo]).session.surface, "activeFocus", true);
219
            tryCompare(ApplicationManager.findApplication(data.apps[data.focusTo]).session.surface, "activeFocus", true);
569
212
        }
220
        }
570
221
571
222
        function test_minimizeApplicationHidesSurface() {
572
223
            var dashApp = startApplication("unity8-dash");
573
224
574
225
            var dashDelegate = findChild(desktopStage, "stageDelegate_unity8-dash");
575
226
            verify(dashDelegate);
576
227
577
228
            findChild(dashDelegate, "decoratedWindow").minimize();
578
229
            tryCompare(dashApp.session.surface, "visible", false);
579
230
        }
580
231
581
232
        function test_maximizeApplicationHidesSurfacesBehindIt() {
582
233
            var dashApp = startApplication("unity8-dash");
583
234
            var dialerApp = startApplication("dialer-app");
584
235
            var cameraApp = startApplication("camera-app");
585
236
586
237
            var dashDelegate = findChild(desktopStage, "stageDelegate_unity8-dash");
587
238
            verify(dashDelegate);
588
239
            var dialerDelegate = findChild(desktopStage, "stageDelegate_dialer-app");
589
240
            verify(dialerDelegate);
590
241
            var cameraDelegate = findChild(desktopStage, "stageDelegate_camera-app");
591
242
            verify(cameraDelegate);
592
243
593
244
            // maximize
594
245
            findChild(dialerDelegate, "decoratedWindow").maximize();
595
246
            tryCompare(dialerDelegate, "visuallyMaximized", true);
596
247
597
248
            tryCompare(dashApp.session.surface, "visible", false);
598
249
            compare(cameraApp.session.surface.visible, true);
599
250
600
251
            // restore
601
252
            findChild(dialerDelegate, "decoratedWindow").maximize();
602
253
            compare(dashApp.session.surface.visible, true);
603
254
            compare(cameraApp.session.surface.visible, true);
604
255
        }
605
256
606
257
        function test_applicationsBecomeVisibleWhenOccludingAppRemoved() {
607
258
            var dashApp = startApplication("unity8-dash");
608
259
            var dashDelegate = findChild(desktopStage, "stageDelegate_unity8-dash");
609
260
            verify(dashDelegate);
610
261
611
262
            var dialerApp = startApplication("dialer-app");
612
263
            var dialerDelegate = findChild(desktopStage, "stageDelegate_dialer-app");
613
264
            verify(dialerDelegate);
614
265
615
266
            var cameraApp = startApplication("camera-app");
616
267
            var cameraDelegate = findChild(desktopStage, "stageDelegate_camera-app");
617
268
            verify(cameraDelegate);
618
269
            findChild(dialerDelegate, "decoratedWindow").maximize();
619
270
620
271
            var galleryApp = startApplication("gallery-app");
621
272
            var galleryDelegate = findChild(desktopStage, "stageDelegate_gallery-app");
622
273
            verify(galleryDelegate);
623
274
            findChild(galleryDelegate, "decoratedWindow").maximize();
624
275
625
276
            tryCompare(dialerDelegate, "visuallyMaximized", true);
626
277
            tryCompare(galleryDelegate, "visuallyMaximized", true);
627
278
628
279
            tryCompare(dashApp.session.surface, "visible", false);
629
280
            tryCompare(dialerApp.session.surface, "visible", false);
630
281
            tryCompare(cameraApp.session.surface, "visible", false);
631
282
632
283
            ApplicationManager.stopApplication("gallery-app");
633
284
634
285
            compare(cameraApp.session.surface.visible, true);
635
286
            tryCompare(dialerApp.session.surface, "visible", true);
636
287
            tryCompare(dashApp.session.surface, "visible", false); // still occluded by maximised dialer
637
288
        }
638
213
    }
289
    }
639
214
}
290
}
640
215
291
641
=== modified file 'tests/qmltests/Stages/tst_PhoneStage.qml'
642
--- tests/qmltests/Stages/tst_PhoneStage.qml	2015-11-04 14:53:36 +0000
643
+++ tests/qmltests/Stages/tst_PhoneStage.qml	2015-11-04 14:53:37 +0000
644
@@ -18,6 +18,7 @@
645
18
import QtTest 1.0
18
import QtTest 1.0
646
19
import Unity.Test 0.1 as UT
19
import Unity.Test 0.1 as UT
647
20
import ".."
20
import ".."
648
21
import "../../../qml/Components"
649
21
import "../../../qml/Stages"
22
import "../../../qml/Stages"
650
22
import Ubuntu.Components 0.1
23
import Ubuntu.Components 0.1
651
23
import Unity.Application 0.1
24
import Unity.Application 0.1
652
@@ -26,6 +27,8 @@
653
26
    width: units.gu(70)
27
    width: units.gu(70)
654
27
    height: units.gu(70)
28
    height: units.gu(70)
655
28
29
656
30
    property var greeter: { fullyShown: true }
657
31
658
29
    PhoneStage {
32
    PhoneStage {
659
30
        id: phoneStage
33
        id: phoneStage
660
31
        anchors { fill: parent; rightMargin: units.gu(30) }
34
        anchors { fill: parent; rightMargin: units.gu(30) }
661
@@ -34,6 +37,7 @@
662
34
        maximizedAppTopMargin: units.gu(3) + units.dp(2)
37
        maximizedAppTopMargin: units.gu(3) + units.dp(2)
663
35
        interactive: true
38
        interactive: true
664
36
        shellOrientation: Qt.PortraitOrientation
39
        shellOrientation: Qt.PortraitOrientation
665
40
        orientations: Orientations {}
666
37
    }
41
    }
667
38
42
668
39
    Binding {
43
    Binding {
669
40
44
670
=== modified file 'tests/qmltests/Stages/tst_TabletStage.qml'
671
--- tests/qmltests/Stages/tst_TabletStage.qml	2015-11-04 14:53:36 +0000
672
+++ tests/qmltests/Stages/tst_TabletStage.qml	2015-11-04 14:53:37 +0000
673
@@ -30,6 +30,8 @@
674
30
    width:  tabletStageLoader.width + controls.width
30
    width:  tabletStageLoader.width + controls.width
675
31
    height: tabletStageLoader.height
31
    height: tabletStageLoader.height
676
32
32
677
33
    property var greeter: { fullyShown: true }
678
34
679
33
    Loader {
35
    Loader {
680
34
        id: tabletStageLoader
36
        id: tabletStageLoader
681
35
37
682
@@ -53,7 +55,10 @@
683
53
                shellOrientation: Qt.LandscapeOrientation
55
                shellOrientation: Qt.LandscapeOrientation
684
54
                nativeWidth: width
56
                nativeWidth: width
685
55
                nativeHeight: height
57
                nativeHeight: height
687
56
                orientations: Orientations{} // Defaults are fine for testing
58
                orientations: Orientations {
688
59
                    native_: Qt.LandscapeOrientation
689
60
                    primary: Qt.LandscapeOrientation
690
61
                }
691
57
                focus: true
62
                focus: true
692
58
            }
63
            }
693
59
        }
64
        }
694
60
65
695
=== modified file 'tests/qmltests/tst_Shell.qml'
696
--- tests/qmltests/tst_Shell.qml	2015-11-04 14:53:36 +0000
697
+++ tests/qmltests/tst_Shell.qml	2015-11-04 14:53:37 +0000
698
@@ -61,6 +61,10 @@
699
61
61
700
62
            anchors.centerIn: parent
62
            anchors.centerIn: parent
701
63
63
702
64
            property int shellOrientation: Qt.PortraitOrientation
703
65
            property int nativeOrientation: Qt.PortraitOrientation
704
66
            property int primaryOrientation: Qt.PortraitOrientation
705
67
706
64
            state: "phone"
68
            state: "phone"
707
65
            states: [
69
            states: [
708
66
                State {
70
                State {
709
@@ -77,6 +81,9 @@
710
77
                        target: shellLoader
81
                        target: shellLoader
711
78
                        width: units.gu(100)
82
                        width: units.gu(100)
712
79
                        height: units.gu(71)
83
                        height: units.gu(71)
713
84
                        shellOrientation: Qt.LandscapeOrientation
714
85
                        nativeOrientation: Qt.LandscapeOrientation
715
86
                        primaryOrientation: Qt.LandscapeOrientation
716
80
                    }
87
                    }
717
81
                },
88
                },
718
82
                State {
89
                State {
719
@@ -99,8 +106,13 @@
720
99
                Shell {
106
                Shell {
721
100
                    id: __shell
107
                    id: __shell
722
101
                    usageScenario: usageScenarioSelector.model[usageScenarioSelector.selectedIndex]
108
                    usageScenario: usageScenarioSelector.model[usageScenarioSelector.selectedIndex]
725
102
                    orientation: Qt.PortraitOrientation
109
                    nativeWidth: width
726
103
                    orientations: Orientations{} // Defaults are fine for testing
110
                    nativeHeight: height
727
111
                    orientation: shellLoader.shellOrientation
728
112
                    orientations: Orientations {
729
113
                        native_: shellLoader.nativeOrientation
730
114
                        primary: shellLoader.primaryOrientation
731
115
                    }
732
104
                    Component.onDestruction: {
116
                    Component.onDestruction: {
733
105
                        shellLoader.itemDestroyed = true;
117
                        shellLoader.itemDestroyed = true;
734
106
                    }
118
                    }
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2015-10-27	Needs Fixing on 2015-10-31
Daniel d'Andrada (community)		2015-10-27	Approve on 2015-10-30
Michał Sawicz			Pending
Michael Zanetti		2015-10-27	Pending
Review via email: mp+275926@code.launchpad.net