1
=== modified file 'debian/control'
2
--- debian/control	2016-04-20 17:09:15 +0000
3
+++ debian/control	2016-04-20 17:09:16 +0000
4
@@ -30,7 +30,7 @@
5
30
               libqt5xmlpatterns5-dev,
30
               libqt5xmlpatterns5-dev,
6
31
               libsystemsettings-dev,
31
               libsystemsettings-dev,
7
32
               libudev-dev,
32
               libudev-dev,
9
33
               libunity-api-dev (>= 7.108),
33
               libunity-api-dev (>= 7.110),
10
34
               libusermetricsoutput1-dev,
34
               libusermetricsoutput1-dev,
11
35
# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
35
# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
12
36
               libx11-dev[!armhf],
36
               libx11-dev[!armhf],
13
37
37
14
=== modified file 'debian/unity8-private.install'
15
--- debian/unity8-private.install	2015-11-18 09:15:06 +0000
16
+++ debian/unity8-private.install	2016-04-20 17:09:16 +0000
17
@@ -14,6 +14,7 @@
18
14
usr/lib/*/unity8/qml/Unity
14
usr/lib/*/unity8/qml/Unity
19
15
usr/lib/*/unity8/qml/UInput
15
usr/lib/*/unity8/qml/UInput
20
16
usr/lib/*/unity8/qml/Utils
16
usr/lib/*/unity8/qml/Utils
21
17
usr/lib/*/unity8/qml/WindowManager
22
17
usr/lib/*/unity8/qml/Wizard
18
usr/lib/*/unity8/qml/Wizard
23
18
usr/share/accountsservice/interfaces
19
usr/share/accountsservice/interfaces
24
19
usr/share/dbus-1/interfaces
20
usr/share/dbus-1/interfaces
25
20
21
26
=== modified file 'plugins/CMakeLists.txt'
27
--- plugins/CMakeLists.txt	2015-11-11 16:03:24 +0000
28
+++ plugins/CMakeLists.txt	2016-04-20 17:09:16 +0000
29
@@ -25,4 +25,5 @@
30
25
add_subdirectory(UInput)
25
add_subdirectory(UInput)
31
26
add_subdirectory(Unity)
26
add_subdirectory(Unity)
32
27
add_subdirectory(Utils)
27
add_subdirectory(Utils)
33
28
add_subdirectory(WindowManager)
34
28
add_subdirectory(Wizard)
29
add_subdirectory(Wizard)
35
29
30
36
=== added directory 'plugins/WindowManager'
37
=== added file 'plugins/WindowManager/CMakeLists.txt'
38
--- plugins/WindowManager/CMakeLists.txt	1970-01-01 00:00:00 +0000
39
+++ plugins/WindowManager/CMakeLists.txt	2016-04-20 17:09:16 +0000
40
@@ -0,0 +1,13 @@
41
1
set(WINDOWMANAGER_SRC
42
2
    TopLevelSurfaceList.cpp
43
3
    WindowManagerPlugin.cpp
44
4
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
45
5
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h
46
6
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h
47
7
   )
48
8
49
9
add_library(windowmanager-qml SHARED ${WINDOWMANAGER_SRC})
50
10
51
11
qt5_use_modules(windowmanager-qml Qml Quick Gui)
52
12
53
13
add_unity8_plugin(WindowManager 0.1 WindowManager TARGETS windowmanager-qml)
54
0
14
55
=== added file 'plugins/WindowManager/TopLevelSurfaceList.cpp'
56
--- plugins/WindowManager/TopLevelSurfaceList.cpp	1970-01-01 00:00:00 +0000
57
+++ plugins/WindowManager/TopLevelSurfaceList.cpp	2016-04-20 17:09:16 +0000
58
@@ -0,0 +1,486 @@
59
1
/*
60
2
 * Copyright (C) 2016 Canonical, Ltd.
61
3
 *
62
4
 * This program is free software; you can redistribute it and/or modify
63
5
 * it under the terms of the GNU General Public License as published by
64
6
 * the Free Software Foundation; version 3.
65
7
 *
66
8
 * This program is distributed in the hope that it will be useful,
67
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
68
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
69
11
 * GNU General Public License for more details.
70
12
 *
71
13
 * You should have received a copy of the GNU General Public License
72
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
73
15
 */
74
16
75
17
#include "TopLevelSurfaceList.h"
76
18
77
19
// unity-api
78
20
#include <unity/shell/application/ApplicationInfoInterface.h>
79
21
#include <unity/shell/application/MirSurfaceInterface.h>
80
22
#include <unity/shell/application/MirSurfaceListInterface.h>
81
23
82
24
#include <QMetaObject>
83
25
84
26
Q_LOGGING_CATEGORY(UNITY_TOPSURFACELIST, "unity.topsurfacelist", QtDebugMsg)
85
27
86
28
#define DEBUG_MSG qCDebug(UNITY_TOPSURFACELIST).nospace().noquote() << __func__
87
29
88
30
using namespace unity::shell::application;
89
31
90
32
TopLevelSurfaceList::TopLevelSurfaceList(QObject *parent) :
91
33
    QAbstractListModel(parent)
92
34
{
93
35
    DEBUG_MSG << "()";
94
36
}
95
37
96
38
TopLevelSurfaceList::~TopLevelSurfaceList()
97
39
{
98
40
    DEBUG_MSG << "()";
99
41
}
100
42
101
43
int TopLevelSurfaceList::rowCount(const QModelIndex &parent) const
102
44
{
103
45
    return !parent.isValid() ? m_surfaceList.size() : 0;
104
46
}
105
47
106
48
QVariant TopLevelSurfaceList::data(const QModelIndex& index, int role) const
107
49
{
108
50
    if (index.row() < 0 || index.row() >= m_surfaceList.size())
109
51
        return QVariant();
110
52
111
53
    if (role == SurfaceRole) {
112
54
        MirSurfaceInterface *surface = m_surfaceList.at(index.row()).surface;
113
55
        return QVariant::fromValue(surface);
114
56
    } else if (role == ApplicationRole) {
115
57
        return QVariant::fromValue(m_surfaceList.at(index.row()).application);
116
58
    } else if (role == IdRole) {
117
59
        return QVariant::fromValue(m_surfaceList.at(index.row()).id);
118
60
    } else {
119
61
        return QVariant();
120
62
    }
121
63
}
122
64
123
65
void TopLevelSurfaceList::raise(MirSurfaceInterface *surface)
124
66
{
125
67
    if (!surface)
126
68
        return;
127
69
128
70
    DEBUG_MSG << "(MirSurface[" << (void*)surface << "])";
129
71
130
72
    int i = indexOf(surface);
131
73
    if (i != -1) {
132
74
        raiseId(m_surfaceList.at(i).id);
133
75
    }
134
76
}
135
77
136
78
void TopLevelSurfaceList::appendPlaceholder(ApplicationInfoInterface *application)
137
79
{
138
80
    DEBUG_MSG << "(" << application->appId() << ")";
139
81
140
82
    appendSurfaceHelper(nullptr, application);
141
83
}
142
84
143
85
void TopLevelSurfaceList::appendSurface(MirSurfaceInterface *surface, ApplicationInfoInterface *application)
144
86
{
145
87
    Q_ASSERT(surface != nullptr);
146
88
147
89
    bool filledPlaceholder = false;
148
90
    for (int i = 0; i < m_surfaceList.count() && !filledPlaceholder; ++i) {
149
91
        ModelEntry &entry = m_surfaceList[i];
150
92
        if (entry.application == application && entry.surface == nullptr) {
151
93
            entry.surface = surface;
152
94
            connectSurface(surface);
153
95
            DEBUG_MSG << " appId=" << application->appId() << " surface=" << surface
154
96
                      << ", filling out placeholder. after: " << toString();
155
97
            Q_EMIT dataChanged(index(i) /* topLeft */, index(i) /* bottomRight */, QVector<int>() << SurfaceRole);
156
98
            filledPlaceholder = true;
157
99
        }
158
100
    }
159
101
160
102
    if (!filledPlaceholder) {
161
103
        DEBUG_MSG << " appId=" << application->appId() << " surface=" << surface << ", adding new row";
162
104
        appendSurfaceHelper(surface, application);
163
105
    }
164
106
}
165
107
166
108
void TopLevelSurfaceList::appendSurfaceHelper(MirSurfaceInterface *surface, ApplicationInfoInterface *application)
167
109
{
168
110
    if (m_modelState == IdleState) {
169
111
        m_modelState = InsertingState;
170
112
        beginInsertRows(QModelIndex(), m_surfaceList.size() /*first*/, m_surfaceList.size() /*last*/);
171
113
    } else {
172
114
        Q_ASSERT(m_modelState == ResettingState);
173
115
        // No point in signaling anything if we're resetting the whole model
174
116
    }
175
117
176
118
    int id = generateId();
177
119
    m_surfaceList.append(ModelEntry(surface, application, id));
178
120
    if (surface) {
179
121
        connectSurface(surface);
180
122
    }
181
123
182
124
    if (m_modelState == InsertingState) {
183
125
        endInsertRows();
184
126
        Q_EMIT countChanged();
185
127
        Q_EMIT listChanged();
186
128
        m_modelState = IdleState;
187
129
    }
188
130
189
131
    DEBUG_MSG << " after " << toString();
190
132
}
191
133
192
134
void TopLevelSurfaceList::connectSurface(MirSurfaceInterface *surface)
193
135
{
194
136
    connect(surface, &MirSurfaceInterface::focusedChanged, this, [this, surface](bool focused){
195
137
            if (focused) {
196
138
                this->raise(surface);
197
139
            }
198
140
        });
199
141
    connect(surface, &MirSurfaceInterface::liveChanged, this, [this, surface](bool live){
200
142
            if (!live) {
201
143
                onSurfaceDied(surface);
202
144
            }
203
145
        });
204
146
    connect(surface, &QObject::destroyed, this, [this, surface](){ this->onSurfaceDestroyed(surface); });
205
147
}
206
148
207
149
void TopLevelSurfaceList::onSurfaceDied(MirSurfaceInterface *surface)
208
150
{
209
151
    int i = indexOf(surface);
210
152
    if (i == -1) {
211
153
        return;
212
154
    }
213
155
214
156
    auto application = m_surfaceList[i].application;
215
157
216
158
    // can't be starting if it already has a surface
217
159
    Q_ASSERT(application->state() != ApplicationInfoInterface::Starting);
218
160
219
161
    if (application->state() == ApplicationInfoInterface::Running) {
220
162
        m_surfaceList[i].removeOnceSurfaceDestroyed = true;
221
163
    } else {
222
164
        // assume it got killed by the out-of-memory daemon.
223
165
        //
224
166
        // So leave entry in the model and only remove its surface, so shell can display a screenshot
225
167
        // in its place.
226
168
        m_surfaceList[i].removeOnceSurfaceDestroyed = false;
227
169
    }
228
170
}
229
171
230
172
void TopLevelSurfaceList::onSurfaceDestroyed(MirSurfaceInterface *surface)
231
173
{
232
174
    int i = indexOf(surface);
233
175
    if (i == -1) {
234
176
        return;
235
177
    }
236
178
237
179
    if (m_surfaceList[i].removeOnceSurfaceDestroyed) {
238
180
        removeAt(i);
239
181
    } else {
240
182
        m_surfaceList[i].surface = nullptr;
241
183
        Q_EMIT dataChanged(index(i) /* topLeft */, index(i) /* bottomRight */, QVector<int>() << SurfaceRole);
242
184
        DEBUG_MSG << " Removed surface from entry. After: " << toString();
243
185
    }
244
186
}
245
187
246
188
void TopLevelSurfaceList::removeAt(int index)
247
189
{
248
190
    if (m_modelState == IdleState) {
249
191
        beginRemoveRows(QModelIndex(), index, index);
250
192
        m_modelState = RemovingState;
251
193
    } else {
252
194
        Q_ASSERT(m_modelState == ResettingState);
253
195
        // No point in signaling anything if we're resetting the whole model
254
196
    }
255
197
256
198
    m_surfaceList.removeAt(index);
257
199
258
200
    if (m_modelState == RemovingState) {
259
201
        endRemoveRows();
260
202
        Q_EMIT countChanged();
261
203
        Q_EMIT listChanged();
262
204
        m_modelState = IdleState;
263
205
    }
264
206
265
207
    DEBUG_MSG << " after " << toString();
266
208
}
267
209
268
210
int TopLevelSurfaceList::indexOf(MirSurfaceInterface *surface)
269
211
{
270
212
    for (int i = 0; i < m_surfaceList.count(); ++i) {
271
213
        if (m_surfaceList.at(i).surface == surface) {
272
214
            return i;
273
215
        }
274
216
    }
275
217
    return -1;
276
218
}
277
219
278
220
void TopLevelSurfaceList::move(int from, int to)
279
221
{
280
222
    if (from == to) return;
281
223
    DEBUG_MSG << " from=" << from << " to=" << to;
282
224
283
225
    if (from >= 0 && from < m_surfaceList.size() && to >= 0 && to < m_surfaceList.size()) {
284
226
        QModelIndex parent;
285
227
        /* When moving an item down, the destination index needs to be incremented
286
228
           by one, as explained in the documentation:
287
229
           http://qt-project.org/doc/qt-5.0/qtcore/qabstractitemmodel.html#beginMoveRows */
288
230
289
231
        Q_ASSERT(m_modelState == IdleState);
290
232
        m_modelState = MovingState;
291
233
292
234
        beginMoveRows(parent, from, from, parent, to + (to > from ? 1 : 0));
293
235
        m_surfaceList.move(from, to);
294
236
        endMoveRows();
295
237
        Q_EMIT listChanged();
296
238
297
239
        m_modelState = IdleState;
298
240
299
241
        DEBUG_MSG << " after " << toString();
300
242
    }
301
243
}
302
244
303
245
MirSurfaceInterface *TopLevelSurfaceList::surfaceAt(int index) const
304
246
{
305
247
    if (index >=0 && index < m_surfaceList.count()) {
306
248
        return m_surfaceList[index].surface;
307
249
    } else {
308
250
        return nullptr;
309
251
    }
310
252
}
311
253
312
254
ApplicationInfoInterface *TopLevelSurfaceList::applicationAt(int index) const
313
255
{
314
256
    if (index >=0 && index < m_surfaceList.count()) {
315
257
        return m_surfaceList[index].application;
316
258
    } else {
317
259
        return nullptr;
318
260
    }
319
261
}
320
262
321
263
int TopLevelSurfaceList::idAt(int index) const
322
264
{
323
265
    if (index >=0 && index < m_surfaceList.count()) {
324
266
        return m_surfaceList[index].id;
325
267
    } else {
326
268
        return 0;
327
269
    }
328
270
}
329
271
330
272
int TopLevelSurfaceList::indexForId(int id) const
331
273
{
332
274
    for (int i = 0; i < m_surfaceList.count(); ++i) {
333
275
        if (m_surfaceList[i].id == id) {
334
276
            return i;
335
277
        }
336
278
    }
337
279
    return -1;
338
280
}
339
281
340
282
void TopLevelSurfaceList::doRaiseId(int id)
341
283
{
342
284
    int fromIndex = indexForId(id);
343
285
    if (fromIndex != -1) {
344
286
        move(fromIndex, 0 /* toIndex */);
345
287
    }
346
288
}
347
289
348
290
void TopLevelSurfaceList::raiseId(int id)
349
291
{
350
292
    if (m_modelState == IdleState) {
351
293
        DEBUG_MSG << "(id=" << id << ") - do it now.";
352
294
        doRaiseId(id);
353
295
    } else {
354
296
        DEBUG_MSG << "(id=" << id << ") - Model busy (modelState=" << m_modelState << "). Try again in the next event loop.";
355
297
        // The model has just signalled some change. If we have a Repeater responding to this update, it will get nuts
356
298
        // if we perform yet another model change straight away.
357
299
        //
358
300
        // A bad sympton of this problem is a Repeater.itemAt(index) call returning null event though Repeater.count says
359
301
        // the index is definitely within bounds.
360
302
        QMetaObject::invokeMethod(this, "raiseId", Qt::QueuedConnection, Q_ARG(int, id));
361
303
    }
362
304
}
363
305
364
306
int TopLevelSurfaceList::generateId()
365
307
{
366
308
    int id = m_nextId;
367
309
    m_nextId = nextFreeId(m_nextId + 1);
368
310
    Q_EMIT nextIdChanged();
369
311
    return id;
370
312
}
371
313
372
314
int TopLevelSurfaceList::nextFreeId(int candidateId)
373
315
{
374
316
    if (candidateId > m_maxId) {
375
317
        return nextFreeId(1);
376
318
    } else {
377
319
        if (indexForId(candidateId) == -1) {
378
320
            // it's indeed free
379
321
            return candidateId;
380
322
        } else {
381
323
            return nextFreeId(candidateId + 1);
382
324
        }
383
325
    }
384
326
}
385
327
386
328
QString TopLevelSurfaceList::toString()
387
329
{
388
330
    QString str;
389
331
    for (int i = 0; i < m_surfaceList.count(); ++i) {
390
332
        auto item = m_surfaceList.at(i);
391
333
392
334
        QString itemStr = QString("(index=%1,appId=%2,surface=0x%3,id=%4)")
393
335
            .arg(i)
394
336
            .arg(item.application->appId())
395
337
            .arg((qintptr)item.surface, 0, 16)
396
338
            .arg(item.id);
397
339
398
340
        if (i > 0) {
399
341
            str.append(",");
400
342
        }
401
343
        str.append(itemStr);
402
344
    }
403
345
    return str;
404
346
}
405
347
406
348
void TopLevelSurfaceList::addApplication(ApplicationInfoInterface *application)
407
349
{
408
350
    DEBUG_MSG << "(" << application->appId() << ")";
409
351
    Q_ASSERT(!m_applications.contains(application));
410
352
    m_applications.append(application);
411
353
412
354
    MirSurfaceListInterface *surfaceList = application->surfaceList();
413
355
414
356
    if (application->state() != ApplicationInfoInterface::Stopped) {
415
357
        if (surfaceList->count() == 0) {
416
358
            appendPlaceholder(application);
417
359
        } else {
418
360
            for (int i = 0; i < surfaceList->count(); ++i) {
419
361
                appendSurface(surfaceList->get(i), application);
420
362
            }
421
363
        }
422
364
    }
423
365
424
366
    connect(surfaceList, &QAbstractItemModel::rowsInserted, this,
425
367
            [this, application, surfaceList](const QModelIndex & /*parent*/, int first, int last)
426
368
            {
427
369
                for (int i = last; i >= first; --i) {
428
370
                    this->appendSurface(surfaceList->get(i), application);
429
371
                }
430
372
            });
431
373
}
432
374
433
375
void TopLevelSurfaceList::removeApplication(ApplicationInfoInterface *application)
434
376
{
435
377
    DEBUG_MSG << "(" << application->appId() << ")";
436
378
    Q_ASSERT(m_applications.contains(application));
437
379
438
380
    MirSurfaceListInterface *surfaceList = application->surfaceList();
439
381
440
382
    disconnect(surfaceList, 0, this, 0);
441
383
442
384
    Q_ASSERT(m_modelState == IdleState);
443
385
    m_modelState = RemovingState;
444
386
445
387
    int i = 0;
446
388
    while (i < m_surfaceList.count()) {
447
389
        if (m_surfaceList.at(i).application == application) {
448
390
            beginRemoveRows(QModelIndex(), i, i);
449
391
            m_surfaceList.removeAt(i);
450
392
            endRemoveRows();
451
393
            Q_EMIT countChanged();
452
394
            Q_EMIT listChanged();
453
395
        } else {
454
396
            ++i;
455
397
        }
456
398
    }
457
399
458
400
    m_modelState = IdleState;
459
401
460
402
    DEBUG_MSG << " after " << toString();
461
403
462
404
    m_applications.removeAll(application);
463
405
}
464
406
465
407
QAbstractListModel *TopLevelSurfaceList::applicationsModel() const
466
408
{
467
409
    return m_applicationsModel;
468
410
}
469
411
470
412
void TopLevelSurfaceList::setApplicationsModel(QAbstractListModel* value)
471
413
{
472
414
    if (m_applicationsModel == value) {
473
415
        return;
474
416
    }
475
417
476
418
    DEBUG_MSG << "(" << value << ")";
477
419
478
420
    Q_ASSERT(m_modelState == IdleState);
479
421
    m_modelState = ResettingState;
480
422
481
423
    beginResetModel();
482
424
483
425
    if (m_applicationsModel) {
484
426
        m_surfaceList.clear();
485
427
        m_applications.clear();
486
428
        disconnect(m_applicationsModel, 0, this, 0);
487
429
    }
488
430
489
431
    m_applicationsModel = value;
490
432
491
433
    if (m_applicationsModel) {
492
434
        findApplicationRole();
493
435
494
436
        connect(m_applicationsModel, &QAbstractItemModel::rowsInserted,
495
437
                this, [this](const QModelIndex &/*parent*/, int first, int last) {
496
438
                    for (int i = first; i <= last; ++i) {
497
439
                        auto application = getApplicationFromModelAt(i);
498
440
                        addApplication(application);
499
441
                    }
500
442
                });
501
443
502
444
        connect(m_applicationsModel, &QAbstractItemModel::rowsAboutToBeRemoved,
503
445
                this, [this](const QModelIndex &/*parent*/, int first, int last) {
504
446
                    for (int i = first; i <= last; ++i) {
505
447
                        auto application = getApplicationFromModelAt(i);
506
448
                        removeApplication(application);
507
449
                    }
508
450
                });
509
451
510
452
        for (int i = 0; i < m_applicationsModel->rowCount(); ++i) {
511
453
            auto application = getApplicationFromModelAt(i);
512
454
            addApplication(application);
513
455
        }
514
456
    }
515
457
516
458
    endResetModel();
517
459
    m_modelState = IdleState;
518
460
}
519
461
520
462
ApplicationInfoInterface *TopLevelSurfaceList::getApplicationFromModelAt(int index)
521
463
{
522
464
    QModelIndex modelIndex = m_applicationsModel->index(index);
523
465
524
466
    QVariant variant =  m_applicationsModel->data(modelIndex, m_applicationRole);
525
467
526
468
    // variant.value<ApplicationInfoInterface*>() returns null for some reason.
527
469
    return static_cast<ApplicationInfoInterface*>(variant.value<QObject*>());
528
470
}
529
471
530
472
void TopLevelSurfaceList::findApplicationRole()
531
473
{
532
474
    QHash<int, QByteArray> namesHash = m_applicationsModel->roleNames();
533
475
534
476
    m_applicationRole = -1;
535
477
    for (auto i = namesHash.begin(); i != namesHash.end() && m_applicationRole == -1; ++i) {
536
478
        if (i.value() == "application") {
537
479
            m_applicationRole = i.key();
538
480
        }
539
481
    }
540
482
541
483
    if (m_applicationRole == -1) {
542
484
        qFatal("TopLevelSurfaceList: applicationsModel must have a \"application\" role.");
543
485
    }
544
486
}
545
0
487
546
=== added file 'plugins/WindowManager/TopLevelSurfaceList.h'
547
--- plugins/WindowManager/TopLevelSurfaceList.h	1970-01-01 00:00:00 +0000
548
+++ plugins/WindowManager/TopLevelSurfaceList.h	2016-04-20 17:09:16 +0000
549
@@ -0,0 +1,223 @@
550
1
/*
551
2
 * Copyright (C) 2016 Canonical, Ltd.
552
3
 *
553
4
 * This program is free software; you can redistribute it and/or modify
554
5
 * it under the terms of the GNU General Public License as published by
555
6
 * the Free Software Foundation; version 3.
556
7
 *
557
8
 * This program is distributed in the hope that it will be useful,
558
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
559
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
560
11
 * GNU General Public License for more details.
561
12
 *
562
13
 * You should have received a copy of the GNU General Public License
563
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
564
15
 */
565
16
566
17
#ifndef TOPLEVELSURFACELIST_H
567
18
#define TOPLEVELSURFACELIST_H
568
19
569
20
#include <QAbstractListModel>
570
21
#include <QList>
571
22
#include <QLoggingCategory>
572
23
573
24
Q_DECLARE_LOGGING_CATEGORY(UNITY_TOPSURFACELIST)
574
25
575
26
namespace unity {
576
27
    namespace shell {
577
28
        namespace application {
578
29
            class ApplicationInfoInterface;
579
30
            class MirSurfaceInterface;
580
31
        }
581
32
    }
582
33
}
583
34
584
35
/**
585
36
 * @brief A model of top-level surfaces
586
37
 *
587
38
 * It's an abstraction of top-level application windows.
588
39
 *
589
40
 * When an entry first appears, it normaly doesn't have a surface yet, meaning that the application is
590
41
 * still starting up. A shell should then display a splash screen or saved screenshot of the application
591
42
 * until its surface comes up.
592
43
 *
593
44
 * As applications can have multiple surfaces and you can also have entries without surfaces at all,
594
45
 * the only way to unambiguously refer to an entry in this model is through its id.
595
46
 */
596
47
class TopLevelSurfaceList : public QAbstractListModel
597
48
{
598
49
599
50
    Q_OBJECT
600
51
601
52
    /**
602
53
     * @brief A list model of applications.
603
54
     *
604
55
     * It's expected to have a role called "application" which returns a ApplicationInfoInterface
605
56
     */
606
57
    Q_PROPERTY(QAbstractListModel* applicationsModel READ applicationsModel
607
58
                                                     WRITE setApplicationsModel
608
59
                                                     NOTIFY applicationsModelChanged)
609
60
610
61
    /**
611
62
     * @brief Number of top-level surfaces in this model
612
63
     *
613
64
     * This is the same as rowCount, added in order to keep compatibility with QML ListModels.
614
65
     */
615
66
    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
616
67
617
68
    /**
618
69
      The id to be used on the next entry created
619
70
      Useful for tests
620
71
     */
621
72
    Q_PROPERTY(int nextId READ nextId NOTIFY nextIdChanged)
622
73
public:
623
74
624
75
    /**
625
76
     * @brief The Roles supported by the model
626
77
     *
627
78
     * SurfaceRole - A MirSurfaceInterface. It will be null if the application is still starting up
628
79
     * ApplicationRole - An ApplicationInfoInterface
629
80
     * IdRole - A unique identifier for this entry. Useful to unambiguosly track elements as they move around in the list
630
81
     */
631
82
    enum Roles {
632
83
        SurfaceRole = Qt::UserRole,
633
84
        ApplicationRole = Qt::UserRole + 1,
634
85
        IdRole = Qt::UserRole + 2,
635
86
    };
636
87
637
88
    explicit TopLevelSurfaceList(QObject *parent = nullptr);
638
89
    virtual ~TopLevelSurfaceList();
639
90
640
91
    // QAbstractItemModel methods
641
92
    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
642
93
    QVariant data(const QModelIndex& index, int role) const override;
643
94
    QHash<int, QByteArray> roleNames() const override {
644
95
        QHash<int, QByteArray> roleNames { {SurfaceRole, "surface"},
645
96
                                           {ApplicationRole, "application"},
646
97
                                           {IdRole, "id"} };
647
98
        return roleNames;
648
99
    }
649
100
650
101
    int nextId() const { return m_nextId; }
651
102
652
103
    QAbstractListModel *applicationsModel() const;
653
104
    void setApplicationsModel(QAbstractListModel*);
654
105
655
106
public Q_SLOTS:
656
107
    /**
657
108
     * @brief Returns the surface at the given index
658
109
     *
659
110
     * It will be a nullptr if the application is still starting up and thus hasn't yet created
660
111
     * and drawn into a surface.
661
112
     */
662
113
    unity::shell::application::MirSurfaceInterface *surfaceAt(int index) const;
663
114
664
115
    /**
665
116
     * @brief Returns the application at the given index
666
117
     */
667
118
    unity::shell::application::ApplicationInfoInterface *applicationAt(int index) const;
668
119
669
120
    /**
670
121
     * @brief Returns the unique id of the element at the given index
671
122
     */
672
123
    int idAt(int index) const;
673
124
674
125
    /**
675
126
     * @brief Returns the index where the row with the given id is located
676
127
     *
677
128
     * Returns -1 if there's no row with the given id.
678
129
     */
679
130
    int indexForId(int id) const;
680
131
681
132
    /**
682
133
     * @brief Raises the row with the given id to index 0
683
134
     */
684
135
    void raiseId(int id);
685
136
686
137
    void doRaiseId(int id);
687
138
688
139
Q_SIGNALS:
689
140
    void countChanged();
690
141
691
142
    /**
692
143
     * @brief Emitted when the list changes
693
144
     *
694
145
     * Emitted when model gains an element, loses an element or when elements exchange positions.
695
146
     */
696
147
    void listChanged();
697
148
698
149
    void nextIdChanged();
699
150
700
151
    void applicationsModelChanged();
701
152
702
153
private:
703
154
    void addApplication(unity::shell::application::ApplicationInfoInterface *application);
704
155
    void removeApplication(unity::shell::application::ApplicationInfoInterface *application);
705
156
706
157
    int indexOf(unity::shell::application::MirSurfaceInterface *surface);
707
158
    void raise(unity::shell::application::MirSurfaceInterface *surface);
708
159
    void move(int from, int to);
709
160
    void appendSurfaceHelper(unity::shell::application::MirSurfaceInterface *surface,
710
161
                              unity::shell::application::ApplicationInfoInterface *application);
711
162
    void connectSurface(unity::shell::application::MirSurfaceInterface *surface);
712
163
    int generateId();
713
164
    int nextFreeId(int candidateId);
714
165
    QString toString();
715
166
    void onSurfaceDestroyed(unity::shell::application::MirSurfaceInterface *surface);
716
167
    void onSurfaceDied(unity::shell::application::MirSurfaceInterface *surface);
717
168
    void removeAt(int index);
718
169
    void findApplicationRole();
719
170
720
171
    unity::shell::application::ApplicationInfoInterface *getApplicationFromModelAt(int index);
721
172
722
173
    /*
723
174
        Placeholder for a future surface from a starting or running application.
724
175
        Enables shell to give immediate feedback to the user by showing, eg,
725
176
        a splash screen.
726
177
727
178
        It's a model row containing a null surface and the given application.
728
179
     */
729
180
    void appendPlaceholder(unity::shell::application::ApplicationInfoInterface *application);
730
181
731
182
    /*
732
183
        Adds a model row with the given surface and application
733
184
734
185
        Alternatively, if a placeholder exists for the given application it's
735
186
        filled with the given surface instead.
736
187
     */
737
188
    void appendSurface(unity::shell::application::MirSurfaceInterface *surface,
738
189
            unity::shell::application::ApplicationInfoInterface *application);
739
190
740
191
    struct ModelEntry {
741
192
        ModelEntry(unity::shell::application::MirSurfaceInterface *surface, unity::shell::application::ApplicationInfoInterface *application, int id)
742
193
            : surface(surface), application(application), id(id) {}
743
194
        unity::shell::application::MirSurfaceInterface *surface;
744
195
        unity::shell::application::ApplicationInfoInterface *application;
745
196
        int id;
746
197
        bool removeOnceSurfaceDestroyed{false};
747
198
    };
748
199
749
200
    QList<ModelEntry> m_surfaceList;
750
201
    int m_nextId{1};
751
202
    static const int m_maxId{1000000};
752
203
753
204
    // applications that are being monitored
754
205
    QList<unity::shell::application::ApplicationInfoInterface *> m_applications;
755
206
756
207
    QAbstractListModel* m_applicationsModel{nullptr};
757
208
    int m_applicationRole{-1};
758
209
759
210
    enum ModelState {
760
211
        IdleState,
761
212
        InsertingState,
762
213
        RemovingState,
763
214
        MovingState,
764
215
        ResettingState
765
216
    };
766
217
    ModelState m_modelState{IdleState};
767
218
};
768
219
769
220
Q_DECLARE_METATYPE(TopLevelSurfaceList*)
770
221
Q_DECLARE_METATYPE(QAbstractListModel*)
771
222
772
223
#endif // TOPLEVELSURFACELIST_H
773
0
224
774
=== added file 'plugins/WindowManager/WindowManagerPlugin.cpp'
775
--- plugins/WindowManager/WindowManagerPlugin.cpp	1970-01-01 00:00:00 +0000
776
+++ plugins/WindowManager/WindowManagerPlugin.cpp	2016-04-20 17:09:16 +0000
777
@@ -0,0 +1,28 @@
778
1
/*
779
2
 * Copyright (C) 2016 Canonical, Ltd.
780
3
 *
781
4
 * This program is free software; you can redistribute it and/or modify
782
5
 * it under the terms of the GNU General Public License as published by
783
6
 * the Free Software Foundation; version 3.
784
7
 *
785
8
 * This program is distributed in the hope that it will be useful,
786
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
787
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
788
11
 * GNU General Public License for more details.
789
12
 *
790
13
 * You should have received a copy of the GNU General Public License
791
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
792
15
 */
793
16
794
17
#include "WindowManagerPlugin.h"
795
18
796
19
#include "TopLevelSurfaceList.h"
797
20
798
21
#include <QtQml>
799
22
800
23
void WindowManagerPlugin::registerTypes(const char *uri)
801
24
{
802
25
    qmlRegisterType<TopLevelSurfaceList>(uri, 0, 1, "TopLevelSurfaceList");
803
26
804
27
    qRegisterMetaType<QAbstractListModel*>("QAbstractListModel*");
805
28
}
806
0
29
807
=== added file 'plugins/WindowManager/WindowManagerPlugin.h'
808
--- plugins/WindowManager/WindowManagerPlugin.h	1970-01-01 00:00:00 +0000
809
+++ plugins/WindowManager/WindowManagerPlugin.h	2016-04-20 17:09:16 +0000
810
@@ -0,0 +1,32 @@
811
1
/*
812
2
 * Copyright (C) 2016 Canonical, Ltd.
813
3
 *
814
4
 * This program is free software; you can redistribute it and/or modify
815
5
 * it under the terms of the GNU General Public License as published by
816
6
 * the Free Software Foundation; version 3.
817
7
 *
818
8
 * This program is distributed in the hope that it will be useful,
819
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
820
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
821
11
 * GNU General Public License for more details.
822
12
 *
823
13
 * You should have received a copy of the GNU General Public License
824
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
825
15
 */
826
16
827
17
#ifndef WINDOWMANAGER_PLUGIN_H
828
18
#define WINDOWMANAGER_PLUGIN_H
829
19
830
20
#include <QtQml/QQmlEngine>
831
21
#include <QtQml/QQmlExtensionPlugin>
832
22
833
23
class WindowManagerPlugin : public QQmlExtensionPlugin
834
24
{
835
25
    Q_OBJECT
836
26
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
837
27
838
28
public:
839
29
    void registerTypes(const char *uri) override;
840
30
};
841
31
842
32
#endif // WINDOWMANAGER_PLUGIN_H
843
0
33
844
=== added file 'plugins/WindowManager/qmldir'
845
--- plugins/WindowManager/qmldir	1970-01-01 00:00:00 +0000
846
+++ plugins/WindowManager/qmldir	2016-04-20 17:09:16 +0000
847
@@ -0,0 +1,2 @@
848
1
module WindowManager
849
2
plugin windowmanager-qml
850
0
3
851
=== modified file 'qml/Components/KeymapSwitcher.qml'
852
--- qml/Components/KeymapSwitcher.qml	2016-04-20 17:09:15 +0000
853
+++ qml/Components/KeymapSwitcher.qml	2016-04-20 17:09:16 +0000
854
@@ -57,16 +57,8 @@
855
57
        currentKeymapIndex = prevIndex;
57
        currentKeymapIndex = prevIndex;
856
58
    }
58
    }
857
59
59
858
60
    // Code below will get much simpler with surface-based window management (the upcoming MirFocusController)
859
61
    property var application: ApplicationManager.focusedApplicationId
860
62
            ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
861
63
            : null
862
64
    property var session: application && application.session ? application.session : null
863
65
    property var surface: session ? session.lastSurface : null
864
66
865
67
    property Binding surfaceKeymapBinding: Binding {
60
    property Binding surfaceKeymapBinding: Binding {
868
68
        target: root.surface
61
        target: MirFocusController.focusedSurface
867
69
        when: root.surface != null && root.surface.live
869
70
        property: "keymap"
62
        property: "keymap"
870
71
        value: root.currentKeymap
63
        value: root.currentKeymap
871
72
    }
64
    }
872
73
65
873
=== modified file 'qml/Greeter/Greeter.qml'
874
--- qml/Greeter/Greeter.qml	2016-03-30 07:46:17 +0000
875
+++ qml/Greeter/Greeter.qml	2016-04-20 17:09:16 +0000
876
@@ -64,7 +64,7 @@
877
64
        d.selectUser(d.currentIndex, true);
64
        d.selectUser(d.currentIndex, true);
878
65
    }
65
    }
879
66
66
881
67
    function notifyAppFocused(appId) {
67
    function notifyAppFocusRequested(appId) {
882
68
        if (!active) {
68
        if (!active) {
883
69
            return;
69
            return;
884
70
        }
70
        }
885
@@ -81,19 +81,20 @@
886
81
        }
81
        }
887
82
    }
82
    }
888
83
83
890
84
    function notifyAboutToFocusApp(appId) {
84
    // Notify that the user has explicitly requested the given app through unity8 GUI.
891
85
    function notifyUserRequestedApp(appId) {
892
85
        if (!active) {
86
        if (!active) {
893
86
            return;
87
            return;
894
87
        }
88
        }
895
88
89
896
89
        // A hint that we're about to focus an app.  This way we can look
90
        // A hint that we're about to focus an app.  This way we can look
897
90
        // a little more responsive, rather than waiting for the above
91
        // a little more responsive, rather than waiting for the above
899
91
        // notifyAppFocused call.  We also need this in case we have a locked
92
        // notifyAppFocusRequested call.  We also need this in case we have a locked
900
92
        // app, in order to show lockscreen instead of new app.
93
        // app, in order to show lockscreen instead of new app.
901
93
        d.startUnlock(false /* toTheRight */);
94
        d.startUnlock(false /* toTheRight */);
902
94
    }
95
    }
903
95
96
905
96
    // This is a just a glorified notifyAboutToFocusApp(), but it does one
97
    // This is a just a glorified notifyUserRequestedApp(), but it does one
906
97
    // other thing: it hides any cover pages to the RIGHT, because the user
98
    // other thing: it hides any cover pages to the RIGHT, because the user
907
98
    // just came from a launcher drag starting on the left.
99
    // just came from a launcher drag starting on the left.
908
99
    // It also returns a boolean value, indicating whether there was a visual
100
    // It also returns a boolean value, indicating whether there was a visual
909
100
101
910
=== modified file 'qml/Launcher/LauncherPanel.qml'
911
--- qml/Launcher/LauncherPanel.qml	2016-03-16 11:20:24 +0000
912
+++ qml/Launcher/LauncherPanel.qml	2016-04-20 17:09:16 +0000
913
@@ -98,6 +98,7 @@
914
98
            AbstractButton {
98
            AbstractButton {
915
99
                id: dashItem
99
                id: dashItem
916
100
                anchors.fill: parent
100
                anchors.fill: parent
917
101
                activeFocusOnPress: false
918
101
                onClicked: root.showDashHome()
102
                onClicked: root.showDashHome()
919
102
            }
103
            }
920
103
            Rectangle {
104
            Rectangle {
921
104
105
922
=== modified file 'qml/Shell.qml'
923
--- qml/Shell.qml	2016-04-20 17:09:15 +0000
924
+++ qml/Shell.qml	2016-04-20 17:09:16 +0000
925
@@ -42,6 +42,7 @@
926
42
import Unity.DashCommunicator 0.1
42
import Unity.DashCommunicator 0.1
927
43
import Unity.Indicators 0.1 as Indicators
43
import Unity.Indicators 0.1 as Indicators
928
44
import Cursor 1.0
44
import Cursor 1.0
929
45
import WindowManager 0.1
930
45
46
931
46
47
932
47
Item {
48
Item {
933
@@ -96,13 +97,45 @@
934
96
        }
97
        }
935
97
    }
98
    }
936
98
99
937
100
    readonly property var mainApp:
938
101
            applicationsDisplayLoader.item ? applicationsDisplayLoader.item.mainApp : null
939
102
    onMainAppChanged: {
940
103
        if (mainApp) {
941
104
            _onMainAppChanged(mainApp.appId);
942
105
        }
943
106
    }
944
107
    Connections {
945
108
        target: ApplicationManager
946
109
        onFocusRequested: {
947
110
            if (shell.mainApp && shell.mainApp.appId === appId) {
948
111
                _onMainAppChanged(appId);
949
112
            }
950
113
        }
951
114
    }
952
115
    function _onMainAppChanged(appId) {
953
116
        if (wizard.active && appId != "" && appId != "unity8-dash") {
954
117
            // If this happens on first boot, we may be in edge
955
118
            // tutorial or wizard while receiving a call.  But a call
956
119
            // is more important than wizard so just bail out of those.
957
120
            tutorial.finish();
958
121
            wizard.hide();
959
122
        }
960
123
961
124
        if (appId === "dialer-app" && callManager.hasCalls && greeter.locked) {
962
125
            // If we are in the middle of a call, make dialer lockedApp and show it.
963
126
            // This can happen if user backs out of dialer back to greeter, then
964
127
            // launches dialer again.
965
128
            greeter.lockedApp = appId;
966
129
        }
967
130
        greeter.notifyAppFocusRequested(appId);
968
131
969
132
        panel.indicators.hide();
970
133
        launcher.hide();
971
134
    }
972
135
973
99
    // For autopilot consumption
136
    // For autopilot consumption
974
100
    readonly property string focusedApplicationId: ApplicationManager.focusedApplicationId
137
    readonly property string focusedApplicationId: ApplicationManager.focusedApplicationId
975
101
138
976
102
    // internal props from here onwards
977
103
    readonly property var mainApp:
978
104
            applicationsDisplayLoader.item ? applicationsDisplayLoader.item.mainApp : null
979
105
980
106
    // Disable everything while greeter is waiting, so that the user can't swipe
139
    // Disable everything while greeter is waiting, so that the user can't swipe
981
107
    // the greeter or launcher until we know whether the session is locked.
140
    // the greeter or launcher until we know whether the session is locked.
982
108
    enabled: greeter && !greeter.waiting
141
    enabled: greeter && !greeter.waiting
983
@@ -139,9 +172,6 @@
984
139
172
985
140
    Component.onCompleted: {
173
    Component.onCompleted: {
986
141
        theme.name = "Ubuntu.Components.Themes.SuruDark"
174
        theme.name = "Ubuntu.Components.Themes.SuruDark"
987
142
        if (ApplicationManager.count > 0) {
988
143
            ApplicationManager.focusApplication(ApplicationManager.get(0).appId);
989
144
        }
990
145
        finishStartUpTimer.start();
175
        finishStartUpTimer.start();
991
146
    }
176
    }
992
147
177
993
@@ -198,36 +228,10 @@
994
198
        width: parent.width
228
        width: parent.width
995
199
        height: parent.height
229
        height: parent.height
996
200
230
1027
201
        Connections {
231
        TopLevelSurfaceList {
1028
202
            target: ApplicationManager
232
            id: topLevelSurfaceList
1029
203
233
            objectName: "topLevelSurfaceList"
1030
204
            // This signal is also fired when we try to focus the current app
234
            applicationsModel: ApplicationManager
1001
205
            // again.  We rely on this!
1002
206
            onFocusedApplicationIdChanged: {
1003
207
                var appId = ApplicationManager.focusedApplicationId;
1004
208
1005
209
                if (wizard.active && appId != "" && appId != "unity8-dash") {
1006
210
                    // If this happens on first boot, we may be in edge
1007
211
                    // tutorial or wizard while receiving a call.  But a call
1008
212
                    // is more important than wizard so just bail out of those.
1009
213
                    tutorial.finish();
1010
214
                    wizard.hide();
1011
215
                }
1012
216
1013
217
                if (appId === "dialer-app" && callManager.hasCalls && greeter.locked) {
1014
218
                    // If we are in the middle of a call, make dialer lockedApp and show it.
1015
219
                    // This can happen if user backs out of dialer back to greeter, then
1016
220
                    // launches dialer again.
1017
221
                    greeter.lockedApp = appId;
1018
222
                }
1019
223
                greeter.notifyAppFocused(appId);
1020
224
1021
225
                panel.indicators.hide();
1022
226
            }
1023
227
1024
228
            onApplicationAdded: {
1025
229
                launcher.hide();
1026
230
            }
1031
231
        }
235
        }
1032
232
236
1033
233
        Loader {
237
        Loader {
1034
@@ -258,6 +262,10 @@
1035
258
                    return "Stages/DesktopStage.qml";
262
                    return "Stages/DesktopStage.qml";
1036
259
                }
263
                }
1037
260
            }
264
            }
1038
265
            // TODO: Ensure the current stage is destroyed before the new one gets loaded.
1039
266
            //       Currently the new one will get loaded while the old is still hanging
1040
267
            //       around for a bit, which might lead to conflicts where both stages
1041
268
            //       change the model simultaneously.
1042
261
            onQmlComponentChanged: {
269
            onQmlComponentChanged: {
1043
262
                if (item) item.stageAboutToBeUnloaded();
270
                if (item) item.stageAboutToBeUnloaded();
1044
263
                source = qmlComponent;
271
                source = qmlComponent;
1045
@@ -272,6 +280,11 @@
1046
272
280
1047
273
            Binding {
281
            Binding {
1048
274
                target: applicationsDisplayLoader.item
282
                target: applicationsDisplayLoader.item
1049
283
                property: "focus"
1050
284
                value: true
1051
285
            }
1052
286
            Binding {
1053
287
                target: applicationsDisplayLoader.item
1054
275
                property: "objectName"
288
                property: "objectName"
1055
276
                value: "stage"
289
                value: "stage"
1056
277
            }
290
            }
1057
@@ -356,6 +369,16 @@
1058
356
                property: "leftMargin"
369
                property: "leftMargin"
1059
357
                value: shell.usageScenario == "desktop" && !settings.autohideLauncher ? launcher.panelWidth: 0
370
                value: shell.usageScenario == "desktop" && !settings.autohideLauncher ? launcher.panelWidth: 0
1060
358
            }
371
            }
1061
372
            Binding {
1062
373
                target: applicationsDisplayLoader.item
1063
374
                property: "applicationManager"
1064
375
                value: ApplicationManager
1065
376
            }
1066
377
            Binding {
1067
378
                target: applicationsDisplayLoader.item
1068
379
                property: "topLevelSurfaceList"
1069
380
                value: topLevelSurfaceList
1070
381
            }
1071
359
        }
382
        }
1072
360
    }
383
    }
1073
361
384
1074
@@ -370,16 +393,6 @@
1075
370
        z: notifications.useModal || panel.indicators.shown || wizard.active || tutorial.running ? overlay.z + 1 : overlay.z - 1
393
        z: notifications.useModal || panel.indicators.shown || wizard.active || tutorial.running ? overlay.z + 1 : overlay.z - 1
1076
371
    }
394
    }
1077
372
395
1078
373
    Connections {
1079
374
        target: SessionManager
1080
375
        onSessionStopping: {
1081
376
            if (!session.parentSession && !session.application) {
1082
377
                // nothing is using it. delete it right away
1083
378
                session.release();
1084
379
            }
1085
380
        }
1086
381
    }
1087
382
1088
383
    Loader {
396
    Loader {
1089
384
        id: greeterLoader
397
        id: greeterLoader
1090
385
        anchors.fill: parent
398
        anchors.fill: parent
1091
@@ -471,7 +484,7 @@
1092
471
    }
484
    }
1093
472
485
1094
473
    function showHome() {
486
    function showHome() {
1096
474
        greeter.notifyAboutToFocusApp("unity8-dash");
487
        greeter.notifyUserRequestedApp("unity8-dash");
1097
475
488
1098
476
        var animate = !lightDM.greeter.active && !stages.shown
489
        var animate = !lightDM.greeter.active && !stages.shown
1099
477
        dash.setCurrentScope(0, animate, false)
490
        dash.setCurrentScope(0, animate, false)
1100
@@ -520,9 +533,10 @@
1101
520
                greeterShown: greeter.shown
533
                greeterShown: greeter.shown
1102
521
            }
534
            }
1103
522
535
1107
523
            readonly property bool topmostApplicationIsFullscreen: mainApp && mainApp.fullscreen
536
            readonly property bool focusedSurfaceIsFullscreen: MirFocusController.focusedSurface
1108
524
537
                ? MirFocusController.focusedSurface.state === Mir.FullscreenState
1109
525
            fullscreenMode: (topmostApplicationIsFullscreen && !lightDM.greeter.active && launcher.progress == 0)
538
                : false
1110
539
            fullscreenMode: (focusedSurfaceIsFullscreen && !lightDM.greeter.active && launcher.progress == 0)
1111
526
                            || greeter.hasLockedApp
540
                            || greeter.hasLockedApp
1112
527
            locked: greeter && greeter.active
541
            locked: greeter && greeter.active
1113
528
        }
542
        }
1114
@@ -555,7 +569,7 @@
1115
555
                }
569
                }
1116
556
            }
570
            }
1117
557
            onLauncherApplicationSelected: {
571
            onLauncherApplicationSelected: {
1119
558
                greeter.notifyAboutToFocusApp(appId);
572
                greeter.notifyUserRequestedApp(appId);
1120
559
                shell.activateApplication(appId);
573
                shell.activateApplication(appId);
1121
560
            }
574
            }
1122
561
            onShownChanged: {
575
            onShownChanged: {
1123
@@ -719,7 +733,7 @@
1124
719
        onMouseMoved: { cursor.opacity = 1; }
733
        onMouseMoved: { cursor.opacity = 1; }
1125
720
    }
734
    }
1126
721
735
1128
722
    // non-visual item
736
    // non-visual object
1129
723
    KeymapSwitcher {}
737
    KeymapSwitcher {}
1130
724
738
1131
725
    Rectangle {
739
    Rectangle {
1132
726
740
1133
=== modified file 'qml/Stages/AbstractStage.qml'
1134
--- qml/Stages/AbstractStage.qml	2016-04-20 17:09:15 +0000
1135
+++ qml/Stages/AbstractStage.qml	2016-04-20 17:09:16 +0000
1136
@@ -18,12 +18,19 @@
1137
18
import Ubuntu.Components 1.3
18
import Ubuntu.Components 1.3
1138
19
import GSettings 1.0
19
import GSettings 1.0
1139
20
20
1141
21
Rectangle {
21
FocusScope {
1142
22
    id: root
22
    id: root
1143
23
23
1145
24
    color: "#060606"
24
    property alias color: backRect.color
1146
25
    Rectangle {
1147
26
        id: backRect
1148
27
        color: "#060606"
1149
28
        anchors.fill: parent
1150
29
    }
1151
25
30
1152
26
    // Controls to be set from outside
31
    // Controls to be set from outside
1153
32
    property QtObject applicationManager
1154
33
    property QtObject topLevelSurfaceList
1155
27
    property bool altTabPressed
34
    property bool altTabPressed
1156
28
    property url background
35
    property url background
1157
29
    property bool beingResized
36
    property bool beingResized
1158
30
37
1159
=== removed directory 'qml/Stages/Animations'
1160
=== removed file 'qml/Stages/Animations/BaseSessionAnimation.qml'
1161
--- qml/Stages/Animations/BaseSessionAnimation.qml	2015-07-15 15:07:19 +0000
1162
+++ qml/Stages/Animations/BaseSessionAnimation.qml	1970-01-01 00:00:00 +0000
1163
@@ -1,96 +0,0 @@
1164
1
/*
1165
2
 * Copyright (C) 2014 Canonical, Ltd.
1166
3
 *
1167
4
 * This program is free software; you can redistribute it and/or modify
1168
5
 * it under the terms of the GNU General Public License as published by
1169
6
 * the Free Software Foundation; version 3.
1170
7
 *
1171
8
 * This program is distributed in the hope that it will be useful,
1172
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1173
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1174
11
 * GNU General Public License for more details.
1175
12
 *
1176
13
 * You should have received a copy of the GNU General Public License
1177
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1178
15
 */
1179
16
1180
17
import QtQuick 2.4
1181
18
1182
19
/* This is the base case for surface animations, used when adding/removing * child surfaces.
1183
20
 * The class is meant to be overridden and changes/animations provided for state changes.
1184
21
 * NB. It is important to release the surface at the end of the "out" animation.
1185
22
 *
1186
23
 * Example - Simple fade in/out
1187
24
 *
1188
25
 * BaseSurfaceAnimation {
1189
26
 *     outChanges: [ PropertyChanges { target: animation.surface; opacity: 0.0 } ]
1190
27
 *     outAnimations: [
1191
28
           SequentialAnimation {
1192
29
 *             NumberAnimation { target: animation.surface; property: "opacity"; duration: 300 }
1193
30
 *             ScriptAction { script: { if (animation.parent.removing) animation.surface.release(); } }
1194
31
 *         }
1195
32
 *     ]
1196
33
 *
1197
34
 *     inChanges: [ PropertyChanges { target: animation.surface; opacity: 1.0 } ]
1198
35
 *     inAnimations: [ NumberAnimation { target: animation.surface; property: "opacity"; duration: 300 } ]
1199
36
 * }
1200
37
 */
1201
38
Item {
1202
39
    id: base
1203
40
    property var container
1204
41
    objectName: "sessionAnimation"
1205
42
1206
43
    // changes applied when state changes to "from"
1207
44
    property list<QtObject> fromChanges
1208
45
    // transition animations when changing state to "from"
1209
46
    property list<QtObject> fromAnimations
1210
47
1211
48
    // changes applied when state changes to "to"
1212
49
    property list<QtObject> toChanges
1213
50
    // transition animations when changing state to "to"
1214
51
    property list<QtObject> toAnimations
1215
52
1216
53
    function start() {
1217
54
        // "prep" state forces toChanges without transition animations.
1218
55
        state = "prep"
1219
56
        state = "to";
1220
57
    }
1221
58
    function end() {
1222
59
        state = "from";
1223
60
    }
1224
61
1225
62
    signal completed()
1226
63
1227
64
    states: [
1228
65
        State {
1229
66
            name: "baseAnimation"
1230
67
            PropertyChanges { target: container; anchors.fill: undefined }
1231
68
        },
1232
69
1233
70
        State {
1234
71
            name: "prep"
1235
72
            extend: "baseAnimation"
1236
73
            changes: fromChanges
1237
74
        },
1238
75
        State {
1239
76
            name: "from"
1240
77
            extend: "prep"
1241
78
        },
1242
79
        State {
1243
80
            name: "in"
1244
81
            extend: "baseAnimation"
1245
82
            changes: toChanges
1246
83
        }
1247
84
    ]
1248
85
1249
86
    transitions: [
1250
87
        Transition {
1251
88
            to:  "from"
1252
89
            animations: fromAnimations
1253
90
        },
1254
91
        Transition {
1255
92
            to: "to"
1256
93
            animations: toAnimations
1257
94
        }
1258
95
    ]
1259
96
}
1260
97
0
1261
=== removed file 'qml/Stages/Animations/SwipeFromBottomAnimation.qml'
1262
--- qml/Stages/Animations/SwipeFromBottomAnimation.qml	2015-07-15 15:07:19 +0000
1263
+++ qml/Stages/Animations/SwipeFromBottomAnimation.qml	1970-01-01 00:00:00 +0000
1264
@@ -1,53 +0,0 @@
1265
1
/*
1266
2
 * Copyright (C) 2014 Canonical, Ltd.
1267
3
 *
1268
4
 * This program is free software; you can redistribute it and/or modify
1269
5
 * it under the terms of the GNU General Public License as published by
1270
6
 * the Free Software Foundation; version 3.
1271
7
 *
1272
8
 * This program is distributed in the hope that it will be useful,
1273
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1274
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1275
11
 * GNU General Public License for more details.
1276
12
 *
1277
13
 * You should have received a copy of the GNU General Public License
1278
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1279
15
 */
1280
16
1281
17
import QtQuick 2.4
1282
18
import Ubuntu.Components 1.3
1283
19
1284
20
BaseSessionAnimation {
1285
21
    id: animation
1286
22
1287
23
    fromChanges: [
1288
24
        AnchorChanges {
1289
25
            target: container;
1290
26
            anchors.top: container.parent.bottom
1291
27
        }
1292
28
    ]
1293
29
    fromAnimations: [
1294
30
        SequentialAnimation {
1295
31
            // clip so we don't go out of parent's bounds during spread
1296
32
            PropertyAction { target: container.parent; property: "clip"; value: true }
1297
33
            AnchorAnimation { easing: UbuntuAnimation.StandardEasing; duration: UbuntuAnimation.BriskDuration }
1298
34
            PropertyAction { target: container.parent; property: "clip"; value: false }
1299
35
            ScriptAction { script: { animation.completed(); } }
1300
36
        }
1301
37
    ]
1302
38
1303
39
    toChanges: [
1304
40
        AnchorChanges {
1305
41
            target: container;
1306
42
            anchors.top: container.parent.top
1307
43
        }
1308
44
    ]
1309
45
    toAnimations: [
1310
46
        SequentialAnimation {
1311
47
            // clip so we don't go out of parent's bounds during spread
1312
48
            PropertyAction { target: container.parent; property: "clip"; value: true }
1313
49
            AnchorAnimation { easing: UbuntuAnimation.StandardEasing; duration: UbuntuAnimation.BriskDuration }
1314
50
            PropertyAction { target: container.parent; property: "clip"; value: false }
1315
51
        }
1316
52
    ]
1317
53
}
1318
54
0
1319
=== modified file 'qml/Stages/ApplicationWindow.qml'
1320
--- qml/Stages/ApplicationWindow.qml	2016-04-20 17:09:15 +0000
1321
+++ qml/Stages/ApplicationWindow.qml	2016-04-20 17:09:16 +0000
1322
@@ -20,35 +20,77 @@
1323
20
20
1324
21
FocusScope {
21
FocusScope {
1325
22
    id: root
22
    id: root
1328
23
    implicitWidth: sessionContainer.implicitWidth
23
    implicitWidth: surfaceContainer.implicitWidth
1329
24
    implicitHeight: sessionContainer.implicitHeight
24
    implicitHeight: surfaceContainer.implicitHeight
1330
25
25
1331
26
    // to be read from outside
26
    // to be read from outside
1333
27
    property alias interactive: sessionContainer.interactive
27
    property alias interactive: surfaceContainer.interactive
1334
28
    property bool orientationChangesEnabled: d.supportsSurfaceResize ? d.surfaceOldEnoughToBeResized : true
28
    property bool orientationChangesEnabled: d.supportsSurfaceResize ? d.surfaceOldEnoughToBeResized : true
1337
29
    readonly property string title: sessionContainer.surface && sessionContainer.surface.name !== "" ?
29
    readonly property string title: surface && surface.name !== "" ? surface.name : d.name
1336
30
                                        sessionContainer.surface.name : d.name
1338
31
30
1339
32
    // overridable from outside
31
    // overridable from outside
1341
33
    property bool fullscreen: application ? application.fullscreen : false
32
    property bool fullscreen: {
1342
33
        if (surface) {
1343
34
            return surface.state === Mir.FullscreenState;
1344
35
        } else if (application) {
1345
36
            return application.fullscreen;
1346
37
        } else {
1347
38
            return false;
1348
39
        }
1349
40
    }
1350
34
41
1351
35
    // to be set from outside
42
    // to be set from outside
1352
43
    property QtObject surface
1353
36
    property QtObject application
44
    property QtObject application
1354
37
    property int surfaceOrientationAngle
45
    property int surfaceOrientationAngle
1356
38
    property alias resizeSurface: sessionContainer.resizeSurface
46
    property alias resizeSurface: surfaceContainer.resizeSurface
1357
39
    property int requestedWidth: -1
47
    property int requestedWidth: -1
1358
40
    property int requestedHeight: -1
48
    property int requestedHeight: -1
1359
41
49
1366
42
    readonly property int minimumWidth: sessionContainer.surface ? sessionContainer.surface.minimumWidth : 0
50
    readonly property int minimumWidth: surface ? surface.minimumWidth : 0
1367
43
    readonly property int minimumHeight: sessionContainer.surface ? sessionContainer.surface.minimumHeight : 0
51
    readonly property int minimumHeight: surface ? surface.minimumHeight : 0
1368
44
    readonly property int maximumWidth: sessionContainer.surface ? sessionContainer.surface.maximumWidth : 0
52
    readonly property int maximumWidth: surface ? surface.maximumWidth : 0
1369
45
    readonly property int maximumHeight: sessionContainer.surface ? sessionContainer.surface.maximumHeight : 0
53
    readonly property int maximumHeight: surface ? surface.maximumHeight : 0
1370
46
    readonly property int widthIncrement: sessionContainer.surface ? sessionContainer.surface.widthIncrement : 0
54
    readonly property int widthIncrement: surface ? surface.widthIncrement : 0
1371
47
    readonly property int heightIncrement: sessionContainer.surface ? sessionContainer.surface.heightIncrement : 0
55
    readonly property int heightIncrement: surface ? surface.heightIncrement : 0
1372
56
1373
57
    onSurfaceChanged: {
1374
58
        // The order in which the instructions are executed here matters, to that the correct state
1375
59
        // transitions in stateGroup take place.
1376
60
        // More specifically, the moment surfaceContainer.surface gets updated relative to the
1377
61
        // other instructions.
1378
62
        if (surface) {
1379
63
            surfaceContainer.surface = surface;
1380
64
            d.liveSurface = surface.live;
1381
65
            d.hadSurface = false;
1382
66
            surfaceInitTimer.start();
1383
67
        } else {
1384
68
            if (d.surfaceInitialized) {
1385
69
                d.hadSurface = true;
1386
70
            }
1387
71
            d.surfaceInitialized = false;
1388
72
            surfaceContainer.surface = null;
1389
73
        }
1390
74
    }
1391
48
75
1392
49
    QtObject {
76
    QtObject {
1393
50
        id: d
77
        id: d
1394
51
78
1395
79
        property bool liveSurface: false;
1396
80
        property var con: Connections {
1397
81
            target: root.surface
1398
82
            onLiveChanged: d.liveSurface = root.surface.live
1399
83
        }
1400
84
        // using liveSurface instead of root.surface.live because with the latter
1401
85
        // this expression is not reevaluated when root.surface changes
1402
86
        readonly property bool needToTakeScreenshot: root.surface && d.surfaceInitialized && !d.liveSurface
1403
87
                                                  && applicationState !== ApplicationInfoInterface.Running
1404
88
        onNeedToTakeScreenshotChanged: {
1405
89
            if (needToTakeScreenshot && screenshotImage.status === Image.Null) {
1406
90
                screenshotImage.take();
1407
91
            }
1408
92
        }
1409
93
1410
52
        // helpers so that we don't have to check for the existence of an application everywhere
94
        // helpers so that we don't have to check for the existence of an application everywhere
1411
53
        // (in order to avoid breaking qml binding due to a javascript exception)
95
        // (in order to avoid breaking qml binding due to a javascript exception)
1412
54
        readonly property string name: root.application ? root.application.name : ""
96
        readonly property string name: root.application ? root.application.name : ""
1413
@@ -62,17 +104,7 @@
1414
62
        readonly property color splashColorFooter: root.application ? root.application.splashColorFooter : "#00000000"
104
        readonly property color splashColorFooter: root.application ? root.application.splashColorFooter : "#00000000"
1415
63
105
1416
64
        // Whether the Application had a surface before but lost it.
106
        // Whether the Application had a surface before but lost it.
1428
65
        property bool hadSurface: sessionContainer.surfaceContainer.hadSurface
107
        property bool hadSurface: false
1418
66
1419
67
        readonly property bool needToTakeScreenshot:
1420
68
            ((sessionContainer.surface && d.surfaceInitialized) || d.hadSurface)
1421
69
            && screenshotImage.status === Image.Null
1422
70
            && d.applicationState === ApplicationInfoInterface.Stopped
1423
71
        onNeedToTakeScreenshotChanged: {
1424
72
            if (needToTakeScreenshot) {
1425
73
                screenshotImage.take();
1426
74
            }
1427
75
        }
1429
76
108
1430
77
        //FIXME - this is a hack to avoid the first few rendered frames as they
109
        //FIXME - this is a hack to avoid the first few rendered frames as they
1431
78
        // might show the UI accommodating due to surface resizes on startup.
110
        // might show the UI accommodating due to surface resizes on startup.
1432
@@ -99,7 +131,9 @@
1433
99
    Timer {
131
    Timer {
1434
100
        id: surfaceInitTimer
132
        id: surfaceInitTimer
1435
101
        interval: 100
133
        interval: 100
1437
102
        onTriggered: { if (sessionContainer.surface) {d.surfaceInitialized = true;} }
134
        onTriggered: {
1438
135
            if (root.surface && root.surface.live) {d.surfaceInitialized = true;}
1439
136
        }
1440
103
    }
137
    }
1441
104
138
1442
105
    Timer {
139
    Timer {
1443
@@ -117,7 +151,7 @@
1444
117
        function take() {
151
        function take() {
1445
118
            // Save memory by using a half-resolution (thus quarter size) screenshot.
152
            // Save memory by using a half-resolution (thus quarter size) screenshot.
1446
119
            // Do not make this a binding, we can only take the screenshot once!
153
            // Do not make this a binding, we can only take the screenshot once!
1448
120
            sessionContainer.grabToImage(
154
            surfaceContainer.grabToImage(
1449
121
                function(result) {
155
                function(result) {
1450
122
                    screenshotImage.source = result.url;
156
                    screenshotImage.source = result.url;
1451
123
                },
157
                },
1452
@@ -144,46 +178,33 @@
1453
144
        }
178
        }
1454
145
    }
179
    }
1455
146
180
1461
147
    SessionContainer {
181
    SurfaceContainer {
1462
148
        id: sessionContainer
182
        id: surfaceContainer
1458
149
        // A fake application might not even have a session property.
1459
150
        session: application && application.session ? application.session : null
1460
151
1463
152
        requestedWidth: root.requestedWidth
183
        requestedWidth: root.requestedWidth
1464
153
        requestedHeight: root.requestedHeight
184
        requestedHeight: root.requestedHeight
1465
154
1466
155
        surfaceOrientationAngle: application && application.rotatesWindowContents ? root.surfaceOrientationAngle : 0
185
        surfaceOrientationAngle: application && application.rotatesWindowContents ? root.surfaceOrientationAngle : 0
1467
156
1468
157
        onSurfaceChanged: {
1469
158
            if (sessionContainer.surface) {
1470
159
                surfaceInitTimer.start();
1471
160
            } else {
1472
161
                d.surfaceInitialized = false;
1473
162
            }
1474
163
        }
1475
164
1476
165
        focus: true
186
        focus: true
1477
166
    }
187
    }
1478
167
188
1480
168
    // SessionContainer size drives ApplicationWindow size
189
    // SurfaceContainer size drives ApplicationWindow size
1481
169
    Binding {
190
    Binding {
1482
170
        target: root; property: "width"
191
        target: root; property: "width"
1484
171
        value: stateGroup.state === "surface" ? sessionContainer.width : root.requestedWidth
192
        value: stateGroup.state === "surface" ? surfaceContainer.width : root.requestedWidth
1485
172
        when: root.requestedWidth >= 0
193
        when: root.requestedWidth >= 0
1486
173
    }
194
    }
1487
174
    Binding {
195
    Binding {
1488
175
        target: root; property: "height"
196
        target: root; property: "height"
1490
176
        value: stateGroup.state === "surface" ? sessionContainer.height : root.requestedHeight
197
        value: stateGroup.state === "surface" ? surfaceContainer.height : root.requestedHeight
1491
177
        when: root.requestedHeight >= 0
198
        when: root.requestedHeight >= 0
1492
178
    }
199
    }
1493
179
200
1495
180
    // ApplicationWindow size drives SessionContainer size
201
    // ApplicationWindow size drives SurfaceContainer size
1496
181
    Binding {
202
    Binding {
1498
182
        target: sessionContainer; property: "width"; value: root.width
203
        target: surfaceContainer; property: "width"; value: root.width
1499
183
        when: root.requestedWidth < 0
204
        when: root.requestedWidth < 0
1500
184
    }
205
    }
1501
185
    Binding {
206
    Binding {
1503
186
        target: sessionContainer; property: "height"; value: root.height
207
        target: surfaceContainer; property: "height"; value: root.height
1504
187
        when: root.requestedHeight < 0
208
        when: root.requestedHeight < 0
1505
188
    }
209
    }
1506
189
210
1507
@@ -194,32 +215,43 @@
1508
194
            State {
215
            State {
1509
195
                name: "void"
216
                name: "void"
1510
196
                when:
217
                when:
1512
197
                     d.hadSurface && (!sessionContainer.surface || !d.surfaceInitialized)
218
                     d.hadSurface && (!root.surface || !d.surfaceInitialized)
1513
198
                     &&
219
                     &&
1514
199
                     screenshotImage.status !== Image.Ready
220
                     screenshotImage.status !== Image.Ready
1515
200
            },
221
            },
1516
201
            State {
222
            State {
1517
202
                name: "splashScreen"
223
                name: "splashScreen"
1518
203
                when:
224
                when:
1520
204
                     !d.hadSurface && (!sessionContainer.surface || !d.surfaceInitialized)
225
                     !d.hadSurface && (!root.surface || !d.surfaceInitialized)
1521
205
                     &&
226
                     &&
1522
206
                     screenshotImage.status !== Image.Ready
227
                     screenshotImage.status !== Image.Ready
1523
207
            },
228
            },
1524
208
            State {
229
            State {
1525
209
                name: "surface"
230
                name: "surface"
1526
210
                when:
231
                when:
1528
211
                      (sessionContainer.surface && d.surfaceInitialized)
232
                      (root.surface && d.surfaceInitialized)
1529
212
                      &&
233
                      &&
1532
213
                      (d.applicationState !== ApplicationInfoInterface.Stopped
234
                      (d.liveSurface ||
1533
214
                       || screenshotImage.status !== Image.Ready)
235
                       (d.applicationState !== ApplicationInfoInterface.Running
1534
236
                        && screenshotImage.status !== Image.Ready))
1535
215
            },
237
            },
1536
216
            State {
238
            State {
1537
217
                name: "screenshot"
239
                name: "screenshot"
1538
218
                when:
240
                when:
1539
219
                      screenshotImage.status === Image.Ready
241
                      screenshotImage.status === Image.Ready
1540
220
                      &&
242
                      &&
1543
221
                      (d.applicationState === ApplicationInfoInterface.Stopped
243
                      (d.applicationState !== ApplicationInfoInterface.Running
1544
222
                       || !sessionContainer.surface || !d.surfaceInitialized)
244
                       || !root.surface || !d.surfaceInitialized)
1545
245
            },
1546
246
            State {
1547
247
                // This is a dead end. From here we expect the surface to be removed from the model
1548
248
                // shortly after we stop referencing to it in our SurfaceContainer.
1549
249
                name: "closed"
1550
250
                when:
1551
251
                      // The surface died while the application is running. It must have been closed
1552
252
                      // by the shell or the application decided to destroy it by itself
1553
253
                      root.surface && d.surfaceInitialized && !d.liveSurface
1554
254
                      && d.applicationState === ApplicationInfoInterface.Running
1555
223
            }
255
            }
1556
224
        ]
256
        ]
1557
225
257
1558
@@ -227,17 +259,17 @@
1559
227
            Transition {
259
            Transition {
1560
228
                from: ""; to: "splashScreen"
260
                from: ""; to: "splashScreen"
1561
229
                PropertyAction { target: splashLoader; property: "active"; value: true }
261
                PropertyAction { target: splashLoader; property: "active"; value: true }
1563
230
                PropertyAction { target: sessionContainer.surfaceContainer
262
                PropertyAction { target: surfaceContainer
1564
231
                                 property: "visible"; value: false }
263
                                 property: "visible"; value: false }
1565
232
            },
264
            },
1566
233
            Transition {
265
            Transition {
1567
234
                from: "splashScreen"; to: "surface"
266
                from: "splashScreen"; to: "surface"
1568
235
                SequentialAnimation {
267
                SequentialAnimation {
1570
236
                    PropertyAction { target: sessionContainer.surfaceContainer
268
                    PropertyAction { target: surfaceContainer
1571
237
                                     property: "opacity"; value: 0.0 }
269
                                     property: "opacity"; value: 0.0 }
1573
238
                    PropertyAction { target: sessionContainer.surfaceContainer
270
                    PropertyAction { target: surfaceContainer
1574
239
                                     property: "visible"; value: true }
271
                                     property: "visible"; value: true }
1576
240
                    UbuntuNumberAnimation { target: sessionContainer.surfaceContainer; property: "opacity";
272
                    UbuntuNumberAnimation { target: surfaceContainer; property: "opacity";
1577
241
                                            from: 0.0; to: 1.0
273
                                            from: 0.0; to: 1.0
1578
242
                                            duration: UbuntuAnimation.BriskDuration }
274
                                            duration: UbuntuAnimation.BriskDuration }
1579
243
                    ScriptAction { script: {
275
                    ScriptAction { script: {
1580
@@ -253,12 +285,12 @@
1581
253
                        surfaceIsOldTimer.stop();
285
                        surfaceIsOldTimer.stop();
1582
254
                        d.surfaceOldEnoughToBeResized = false;
286
                        d.surfaceOldEnoughToBeResized = false;
1583
255
                        splashLoader.active = true;
287
                        splashLoader.active = true;
1585
256
                        sessionContainer.surfaceContainer.visible = true;
288
                        surfaceContainer.visible = true;
1586
257
                    } }
289
                    } }
1587
258
                    UbuntuNumberAnimation { target: splashLoader; property: "opacity";
290
                    UbuntuNumberAnimation { target: splashLoader; property: "opacity";
1588
259
                                            from: 0.0; to: 1.0
291
                                            from: 0.0; to: 1.0
1589
260
                                            duration: UbuntuAnimation.BriskDuration }
292
                                            duration: UbuntuAnimation.BriskDuration }
1591
261
                    PropertyAction { target: sessionContainer.surfaceContainer
293
                    PropertyAction { target: surfaceContainer
1592
262
                                     property: "visible"; value: false }
294
                                     property: "visible"; value: false }
1593
263
                }
295
                }
1594
264
            },
296
            },
1595
@@ -274,15 +306,16 @@
1596
274
                                            from: 0.0; to: 1.0
306
                                            from: 0.0; to: 1.0
1597
275
                                            duration: UbuntuAnimation.BriskDuration }
307
                                            duration: UbuntuAnimation.BriskDuration }
1598
276
                    ScriptAction { script: {
308
                    ScriptAction { script: {
1601
277
                        sessionContainer.surfaceContainer.visible = false;
309
                        surfaceContainer.visible = false;
1602
278
                        if (sessionContainer.session) { sessionContainer.session.release(); }
310
                        surfaceContainer.surface = null;
1603
311
                        d.hadSurface = true;
1604
279
                    } }
312
                    } }
1605
280
                }
313
                }
1606
281
            },
314
            },
1607
282
            Transition {
315
            Transition {
1608
283
                from: "screenshot"; to: "surface"
316
                from: "screenshot"; to: "surface"
1609
284
                SequentialAnimation {
317
                SequentialAnimation {
1611
285
                    PropertyAction { target: sessionContainer.surfaceContainer
318
                    PropertyAction { target: surfaceContainer
1612
286
                                     property: "visible"; value: true }
319
                                     property: "visible"; value: true }
1613
287
                    UbuntuNumberAnimation { target: screenshotImage; property: "opacity";
320
                    UbuntuNumberAnimation { target: screenshotImage; property: "opacity";
1614
288
                                            from: 1.0; to: 0.0
321
                                            from: 1.0; to: 0.0
1615
@@ -310,22 +343,31 @@
1616
310
                ScriptAction { script: {
343
                ScriptAction { script: {
1617
311
                    surfaceIsOldTimer.stop();
344
                    surfaceIsOldTimer.stop();
1618
312
                    d.surfaceOldEnoughToBeResized = false;
345
                    d.surfaceOldEnoughToBeResized = false;
1621
313
                    sessionContainer.surfaceContainer.visible = false;
346
                    surfaceContainer.visible = false;
1620
314
                    if (sessionContainer.session) { sessionContainer.session.release(); }
1622
315
                } }
347
                } }
1623
316
            },
348
            },
1624
317
            Transition {
349
            Transition {
1625
318
                from: "void"; to: "surface"
350
                from: "void"; to: "surface"
1626
319
                SequentialAnimation {
351
                SequentialAnimation {
1630
320
                    PropertyAction { target: sessionContainer.surfaceContainer; property: "opacity"; value: 0.0 }
352
                    PropertyAction { target: surfaceContainer; property: "opacity"; value: 0.0 }
1631
321
                    PropertyAction { target: sessionContainer.surfaceContainer; property: "visible"; value: true }
353
                    PropertyAction { target: surfaceContainer; property: "visible"; value: true }
1632
322
                    UbuntuNumberAnimation { target: sessionContainer.surfaceContainer; property: "opacity";
354
                    UbuntuNumberAnimation { target: surfaceContainer; property: "opacity";
1633
323
                                            from: 0.0; to: 1.0
355
                                            from: 0.0; to: 1.0
1634
324
                                            duration: UbuntuAnimation.BriskDuration }
356
                                            duration: UbuntuAnimation.BriskDuration }
1635
325
                    ScriptAction { script: {
357
                    ScriptAction { script: {
1636
326
                        surfaceIsOldTimer.start();
358
                        surfaceIsOldTimer.start();
1637
327
                    } }
359
                    } }
1638
328
                }
360
                }
1639
361
            },
1640
362
            Transition {
1641
363
                to: "closed"
1642
364
                SequentialAnimation {
1643
365
                    ScriptAction { script: {
1644
366
                        surfaceContainer.visible = false;
1645
367
                        surfaceContainer.surface = null;
1646
368
                        d.hadSurface = true;
1647
369
                    } }
1648
370
                }
1649
329
            }
371
            }
1650
330
        ]
372
        ]
1651
331
    }
373
    }
1652
332
374
1653
=== modified file 'qml/Stages/DecoratedWindow.qml'
1654
--- qml/Stages/DecoratedWindow.qml	2016-02-17 13:17:12 +0000
1655
+++ qml/Stages/DecoratedWindow.qml	2016-04-20 17:09:16 +0000
1656
@@ -26,10 +26,10 @@
1657
26
    width: applicationWindow.width
26
    width: applicationWindow.width
1658
27
    height: (decorationShown ? decoration.height : 0) + applicationWindow.height
27
    height: (decorationShown ? decoration.height : 0) + applicationWindow.height
1659
28
28
1660
29
    property alias window: applicationWindow
1661
30
    property alias application: applicationWindow.application
29
    property alias application: applicationWindow.application
1662
30
    property alias surface: applicationWindow.surface
1663
31
    property alias active: decoration.active
31
    property alias active: decoration.active
1665
32
    property alias title: decoration.title
32
    readonly property alias title: applicationWindow.title
1666
33
    property alias fullscreen: applicationWindow.fullscreen
33
    property alias fullscreen: applicationWindow.fullscreen
1667
34
34
1668
35
    readonly property bool decorationShown: !fullscreen
35
    readonly property bool decorationShown: !fullscreen
1669
@@ -79,11 +79,11 @@
1670
79
    WindowDecoration {
79
    WindowDecoration {
1671
80
        id: decoration
80
        id: decoration
1672
81
        target: root.parent
81
        target: root.parent
1674
82
        objectName: application ? "appWindowDecoration_" + application.appId : "appWindowDecoration_null"
82
        objectName: "appWindowDecoration"
1675
83
        anchors { left: parent.left; top: parent.top; right: parent.right }
83
        anchors { left: parent.left; top: parent.top; right: parent.right }
1676
84
        height: units.gu(3)
84
        height: units.gu(3)
1677
85
        width: root.width
85
        width: root.width
1679
86
        title: window.title
86
        title: applicationWindow.title
1680
87
        visible: root.decorationShown
87
        visible: root.decorationShown
1681
88
88
1682
89
        onClose: root.close();
89
        onClose: root.close();
1683
@@ -94,7 +94,7 @@
1684
94
94
1685
95
    ApplicationWindow {
95
    ApplicationWindow {
1686
96
        id: applicationWindow
96
        id: applicationWindow
1688
97
        objectName: application ? "appWindow_" + application.appId : "appWindow_null"
97
        objectName: "appWindow"
1689
98
        anchors.top: parent.top
98
        anchors.top: parent.top
1690
99
        anchors.topMargin: decoration.height
99
        anchors.topMargin: decoration.height
1691
100
        anchors.left: parent.left
100
        anchors.left: parent.left
1692
101
101
1693
=== modified file 'qml/Stages/DesktopSpread.qml'
1694
--- qml/Stages/DesktopSpread.qml	2016-03-10 22:39:57 +0000
1695
+++ qml/Stages/DesktopSpread.qml	2016-04-20 17:09:16 +0000
1696
@@ -1,5 +1,5 @@
1697
1
/*
1
/*
1699
2
 * Copyright (C) 2015 Canonical, Ltd.
2
 * Copyright (C) 2015-2016 Canonical, Ltd.
1700
3
 *
3
 *
1701
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
1702
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
1703
@@ -20,6 +20,7 @@
1704
20
import Ubuntu.Gestures 0.1
20
import Ubuntu.Gestures 0.1
1705
21
import Unity.Application 0.1
21
import Unity.Application 0.1
1706
22
import "../Components"
22
import "../Components"
1707
23
import Utils 0.1
1708
23
24
1709
24
FocusScope {
25
FocusScope {
1710
25
    id: root
26
    id: root
1711
@@ -69,12 +70,12 @@
1712
69
    }
70
    }
1713
70
71
1714
71
    function selectNext(isAutoRepeat) {
72
    function selectNext(isAutoRepeat) {
1716
72
        if (isAutoRepeat && spreadRepeater.highlightedIndex >= ApplicationManager.count -1) {
73
        if (isAutoRepeat && spreadRepeater.highlightedIndex >= topLevelSurfaceList.count -1) {
1717
73
            return; // AutoRepeat is not allowed to wrap around
74
            return; // AutoRepeat is not allowed to wrap around
1718
74
        }
75
        }
1719
75
76
1722
76
        spreadRepeater.highlightedIndex = (spreadRepeater.highlightedIndex + 1) % ApplicationManager.count;
77
        spreadRepeater.highlightedIndex = (spreadRepeater.highlightedIndex + 1) % topLevelSurfaceList.count;
1723
77
        var newContentX = ((spreadFlickable.contentWidth) / (ApplicationManager.count + 1)) * Math.max(0, Math.min(ApplicationManager.count - 5, spreadRepeater.highlightedIndex - 3));
78
        var newContentX = ((spreadFlickable.contentWidth) / (topLevelSurfaceList.count + 1)) * Math.max(0, Math.min(topLevelSurfaceList.count - 5, spreadRepeater.highlightedIndex - 3));
1724
78
        if (spreadFlickable.contentX < newContentX || spreadRepeater.highlightedIndex == 0) {
79
        if (spreadFlickable.contentX < newContentX || spreadRepeater.highlightedIndex == 0) {
1725
79
            spreadFlickable.snapTo(newContentX)
80
            spreadFlickable.snapTo(newContentX)
1726
80
        }
81
        }
1727
@@ -85,10 +86,10 @@
1728
85
            return; // AutoRepeat is not allowed to wrap around
86
            return; // AutoRepeat is not allowed to wrap around
1729
86
        }
87
        }
1730
87
88
1732
88
        var newIndex = spreadRepeater.highlightedIndex - 1 >= 0 ? spreadRepeater.highlightedIndex - 1 : ApplicationManager.count - 1;
89
        var newIndex = spreadRepeater.highlightedIndex - 1 >= 0 ? spreadRepeater.highlightedIndex - 1 : topLevelSurfaceList.count - 1;
1733
89
        spreadRepeater.highlightedIndex = newIndex;
90
        spreadRepeater.highlightedIndex = newIndex;
1736
90
        var newContentX = ((spreadFlickable.contentWidth) / (ApplicationManager.count + 1)) * Math.max(0, Math.min(ApplicationManager.count - 5, spreadRepeater.highlightedIndex - 1));
91
        var newContentX = ((spreadFlickable.contentWidth) / (topLevelSurfaceList.count + 1)) * Math.max(0, Math.min(topLevelSurfaceList.count - 5, spreadRepeater.highlightedIndex - 1));
1737
91
        if (spreadFlickable.contentX > newContentX || newIndex == ApplicationManager.count -1) {
92
        if (spreadFlickable.contentX > newContentX || newIndex == topLevelSurfaceList.count -1) {
1738
92
            spreadFlickable.snapTo(newContentX)
93
            spreadFlickable.snapTo(newContentX)
1739
93
        }
94
        }
1740
94
    }
95
    }
1741
@@ -98,8 +99,8 @@
1742
98
            if (spreadContainer.visible) {
99
            if (spreadContainer.visible) {
1743
99
                root.playFocusAnimation(spreadRepeater.highlightedIndex)
100
                root.playFocusAnimation(spreadRepeater.highlightedIndex)
1744
100
            }
101
            }
1747
101
            var application = ApplicationManager.get(spreadRepeater.highlightedIndex);
102
            var surface = topLevelSurfaceList.surfaceAt(spreadRepeater.highlightedIndex);
1748
102
            ApplicationManager.requestFocusApplication(application.appId);
103
            surface.requestFocus();
1749
103
        }
104
        }
1750
104
    }
105
    }
1751
105
106
1752
@@ -144,7 +145,7 @@
1753
144
        Repeater {
145
        Repeater {
1754
145
            id: spreadRepeater
146
            id: spreadRepeater
1755
146
            objectName: "spreadRepeater"
147
            objectName: "spreadRepeater"
1757
147
            model: ApplicationManager
148
            model: topLevelSurfaceList
1758
148
149
1759
149
            property int highlightedIndex: -1
150
            property int highlightedIndex: -1
1760
150
            property int closingIndex: -1
151
            property int closingIndex: -1
1761
@@ -182,7 +183,8 @@
1762
182
                    objectName: "clippedSpreadDelegate"
183
                    objectName: "clippedSpreadDelegate"
1763
183
                    anchors.left: parent.left
184
                    anchors.left: parent.left
1764
184
                    anchors.top: parent.top
185
                    anchors.top: parent.top
1766
185
                    application: ApplicationManager.get(index)
186
                    application: model.application
1767
187
                    surface: model.surface
1768
186
                    width: spreadMaths.spreadHeight
188
                    width: spreadMaths.spreadHeight
1769
187
                    height: spreadMaths.spreadHeight
189
                    height: spreadMaths.spreadHeight
1770
188
190
1771
@@ -216,7 +218,7 @@
1772
216
                    id: spreadMaths
218
                    id: spreadMaths
1773
217
                    flickable: spreadFlickable
219
                    flickable: spreadFlickable
1774
218
                    itemIndex: index
220
                    itemIndex: index
1776
219
                    totalItems: Math.max(6, ApplicationManager.count)
221
                    totalItems: Math.max(6, topLevelSurfaceList.count)
1777
220
                    sceneHeight: root.height
222
                    sceneHeight: root.height
1778
221
                    itemHeight: spreadDelegate.height
223
                    itemHeight: spreadDelegate.height
1779
222
                }
224
                }
1780
@@ -310,7 +312,7 @@
1781
310
                            Layout.preferredWidth: height * 8 / 7.6
312
                            Layout.preferredWidth: height * 8 / 7.6
1782
311
                            image: Image {
313
                            image: Image {
1783
312
                                anchors.fill: parent
314
                                anchors.fill: parent
1785
313
                                source: model.icon
315
                                source: model.application.icon
1786
314
                                Rectangle {
316
                                Rectangle {
1787
315
                                    anchors.fill: parent
317
                                    anchors.fill: parent
1788
316
                                    color: "black"
318
                                    color: "black"
1789
@@ -324,7 +326,9 @@
1790
324
                        Label {
326
                        Label {
1791
325
                            Layout.fillWidth: true
327
                            Layout.fillWidth: true
1792
326
                            Layout.preferredHeight: units.gu(6)
328
                            Layout.preferredHeight: units.gu(6)
1794
327
                            text: model.name
329
                            property string surfaceName: model.surface ? model.surface.name : ""
1795
330
                            property string applicationName: model.application ? model.application.name : ""
1796
331
                            text: surfaceName ? surfaceName : applicationName
1797
328
                            wrapMode: Text.WordWrap
332
                            wrapMode: Text.WordWrap
1798
329
                            elide: Text.ElideRight
333
                            elide: Text.ElideRight
1799
330
                            maximumLineCount: 2
334
                            maximumLineCount: 2
1800
@@ -354,7 +358,7 @@
1801
354
                        anchors.margins: -units.gu(2)
358
                        anchors.margins: -units.gu(2)
1802
355
                        onClicked: {
359
                        onClicked: {
1803
356
                            spreadRepeater.closingIndex = index;
360
                            spreadRepeater.closingIndex = index;
1805
357
                            ApplicationManager.stopApplication(model.appId)
361
                            model.surface.close();
1806
358
                        }
362
                        }
1807
359
                    }
363
                    }
1808
360
                }
364
                }
1809
@@ -421,7 +425,7 @@
1810
421
        objectName: "spreadFlickable"
425
        objectName: "spreadFlickable"
1811
422
        anchors.fill: parent
426
        anchors.fill: parent
1812
423
        property int minContentWidth: 6 * Math.min(height / 4, width / 5)
427
        property int minContentWidth: 6 * Math.min(height / 4, width / 5)
1814
424
        contentWidth: Math.max(6, ApplicationManager.count) * Math.min(height / 4, width / 5)
428
        contentWidth: Math.max(6, topLevelSurfaceList.count) * Math.min(height / 4, width / 5)
1815
425
        enabled: false
429
        enabled: false
1816
426
430
1817
427
        function snapTo(contentX) {
431
        function snapTo(contentX) {
1818
@@ -523,7 +527,7 @@
1819
523
    Label {
527
    Label {
1820
524
        id: currentSelectedLabel
528
        id: currentSelectedLabel
1821
525
        anchors { bottom: parent.bottom; bottomMargin: root.height * 0.625; horizontalCenter: parent.horizontalCenter }
529
        anchors { bottom: parent.bottom; bottomMargin: root.height * 0.625; horizontalCenter: parent.horizontalCenter }
1823
526
        text: spreadRepeater.highlightedIndex >= 0 ? ApplicationManager.get(spreadRepeater.highlightedIndex).name : ""
530
        text: spreadRepeater.highlightedIndex >= 0 ? topLevelSurfaceList.surfaceAt(spreadRepeater.highlightedIndex).name : ""
1824
527
        visible: false
531
        visible: false
1825
528
        fontSize: "large"
532
        fontSize: "large"
1826
529
    }
533
    }
1827
@@ -545,7 +549,7 @@
1828
545
            from: "*"
549
            from: "*"
1829
546
            to: "altTab"
550
            to: "altTab"
1830
547
            SequentialAnimation {
551
            SequentialAnimation {
1832
548
                PropertyAction { target: spreadRepeater; property: "highlightedIndex"; value: Math.min(ApplicationManager.count - 1, 1) }
552
                PropertyAction { target: spreadRepeater; property: "highlightedIndex"; value: Math.min(topLevelSurfaceList.count - 1, 1) }
1833
549
                PauseAnimation { duration: spreadContainer.animateIn ? 0 : 140 }
553
                PauseAnimation { duration: spreadContainer.animateIn ? 0 : 140 }
1834
550
                PropertyAction { target: workspaceSelector; property: "visible" }
554
                PropertyAction { target: workspaceSelector; property: "visible" }
1835
551
                PropertyAction { target: spreadContainer; property: "visible" }
555
                PropertyAction { target: spreadContainer; property: "visible" }
1836
552
556
1837
=== modified file 'qml/Stages/DesktopSpreadDelegate.qml'
1838
--- qml/Stages/DesktopSpreadDelegate.qml	2016-01-11 12:29:30 +0000
1839
+++ qml/Stages/DesktopSpreadDelegate.qml	2016-04-20 17:09:16 +0000
1840
@@ -1,5 +1,5 @@
1841
1
/*
1
/*
1843
2
 * Copyright (C) 2014-2015 Canonical, Ltd.
2
 * Copyright (C) 2014-2016 Canonical, Ltd.
1844
3
 *
3
 *
1845
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
1846
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
1847
@@ -25,12 +25,13 @@
1848
25
25
1849
26
    property alias window: applicationWindow
26
    property alias window: applicationWindow
1850
27
    property alias application: applicationWindow.application
27
    property alias application: applicationWindow.application
1851
28
    property alias surface: applicationWindow.surface
1852
28
29
1853
29
    property bool highlightShown: false
30
    property bool highlightShown: false
1854
30
    property real shadowOpacity: 1
31
    property real shadowOpacity: 1
1855
31
32
1858
32
    property int windowWidth: application && application.session && application.session.lastSurface ? application.session.lastSurface.size.width : 0
33
    property int windowWidth: surface ? surface.size.width : 0
1859
33
    property int windowHeight: application && application.session && application.session.lastSurface ? application.session.lastSurface.size.height : 0
34
    property int windowHeight: surface ? surface.size.height : 0
1860
34
35
1861
35
    state: "normal"
36
    state: "normal"
1862
36
    states: [
37
    states: [
1863
37
38
1864
=== modified file 'qml/Stages/DesktopStage.qml'
1865
--- qml/Stages/DesktopStage.qml	2016-04-20 17:09:15 +0000
1866
+++ qml/Stages/DesktopStage.qml	2016-04-20 17:09:16 +0000
1867
@@ -39,45 +39,18 @@
1868
39
    // Used by TutorialRight
39
    // Used by TutorialRight
1869
40
    property bool spreadShown: spread.state == "altTab"
40
    property bool spreadShown: spread.state == "altTab"
1870
41
41
1874
42
    mainApp: ApplicationManager.focusedApplicationId
42
    mainApp: priv.focusedAppDelegate ? priv.focusedAppDelegate.application : null
1872
43
            ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
1873
44
            : null
1875
45
43
1876
46
    // application windows never rotate independently
44
    // application windows never rotate independently
1877
47
    mainAppWindowOrientationAngle: shellOrientationAngle
45
    mainAppWindowOrientationAngle: shellOrientationAngle
1878
48
46
1879
49
    orientationChangesEnabled: true
47
    orientationChangesEnabled: true
1880
50
48
1881
51
    Connections {
1882
52
        target: ApplicationManager
1883
53
        onApplicationAdded: {
1884
54
            if (spread.state == "altTab") {
1885
55
                spread.state = "";
1886
56
            }
1887
57
1888
58
            ApplicationManager.focusApplication(appId);
1889
59
        }
1890
60
1891
61
        onApplicationRemoved: {
1892
62
            priv.focusNext();
1893
63
        }
1894
64
1895
65
        onFocusRequested: {
1896
66
            var appIndex = priv.indexOf(appId);
1897
67
            var appDelegate = appRepeater.itemAt(appIndex);
1898
68
            appDelegate.restore();
1899
69
1900
70
            if (spread.state == "altTab") {
1901
71
                spread.cancel();
1902
72
            }
1903
73
        }
1904
74
    }
1905
75
1906
76
    GlobalShortcut {
49
    GlobalShortcut {
1907
77
        id: closeWindowShortcut
50
        id: closeWindowShortcut
1908
78
        shortcut: Qt.AltModifier|Qt.Key_F4
51
        shortcut: Qt.AltModifier|Qt.Key_F4
1911
79
        onTriggered: ApplicationManager.stopApplication(priv.focusedAppId)
52
        onTriggered: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.close(); } }
1912
80
        active: priv.focusedAppId !== ""
53
        active: priv.focusedAppDelegate !== null
1913
81
    }
54
    }
1914
82
55
1915
83
    GlobalShortcut {
56
    GlobalShortcut {
1916
@@ -121,40 +94,40 @@
1917
121
        active: priv.focusedAppDelegate !== null
94
        active: priv.focusedAppDelegate !== null
1918
122
    }
95
    }
1919
123
96
1920
97
    Connections {
1921
98
        target: root.topLevelSurfaceList
1922
99
        onCountChanged: {
1923
100
            if (spread.state == "altTab") {
1924
101
                spread.cancel();
1925
102
            }
1926
103
        }
1927
104
    }
1928
105
1929
124
    QtObject {
106
    QtObject {
1930
125
        id: priv
107
        id: priv
1931
108
        objectName: "DesktopStagePrivate"
1932
126
109
1937
127
        readonly property string focusedAppId: ApplicationManager.focusedApplicationId
110
        property var focusedAppDelegate: null
1938
128
        readonly property var focusedAppDelegate: {
111
        onFocusedAppDelegateChanged: {
1939
129
            var index = indexOf(focusedAppId);
112
            if (spread.state == "altTab") {
1940
130
            return index >= 0 && index < appRepeater.count ? appRepeater.itemAt(index) : null
113
                spread.state = "";
1941
114
            }
1942
131
        }
115
        }
1943
132
        onFocusedAppDelegateChanged: updateForegroundMaximizedApp();
1944
133
116
1947
134
        property int foregroundMaximizedAppZ: -1
117
        property var foregroundMaximizedAppDelegate: null // for stuff like drop shadow and focusing maximized app by clicking panel
1946
135
        property int foregroundMaximizedAppIndex: -1 // for stuff like drop shadow and focusing maximized app by clicking panel
1948
136
118
1949
137
        function updateForegroundMaximizedApp() {
119
        function updateForegroundMaximizedApp() {
1953
138
            var tmp = -1;
120
            var found = false;
1954
139
            var tmpAppId = -1;
121
            for (var i = 0; i < appRepeater.count && !found; i++) {
1952
140
            for (var i = appRepeater.count - 1; i >= 0; i--) {
1955
141
                var item = appRepeater.itemAt(i);
122
                var item = appRepeater.itemAt(i);
1956
142
                if (item && item.visuallyMaximized) {
123
                if (item && item.visuallyMaximized) {
1972
143
                    tmpAppId = i;
124
                    foregroundMaximizedAppDelegate = item;
1973
144
                    tmp = Math.max(tmp, item.normalZ);
125
                    found = true;
1974
145
                }
126
                }
1975
146
            }
127
            }
1976
147
            foregroundMaximizedAppZ = tmp;
128
            if (!found) {
1977
148
            foregroundMaximizedAppIndex = tmpAppId;
129
                foregroundMaximizedAppDelegate = null;
1978
149
        }
130
            }
1964
150
1965
151
        function indexOf(appId) {
1966
152
            for (var i = 0; i < ApplicationManager.count; i++) {
1967
153
                if (ApplicationManager.get(i).appId == appId) {
1968
154
                    return i;
1969
155
                }
1970
156
            }
1971
157
            return -1;
1979
158
        }
131
        }
1980
159
132
1981
160
        function minimizeAllWindows() {
133
        function minimizeAllWindows() {
1982
@@ -164,16 +137,13 @@
1983
164
                    appDelegate.minimize();
137
                    appDelegate.minimize();
1984
165
                }
138
                }
1985
166
            }
139
            }
1986
167
1987
168
            ApplicationManager.unfocusCurrentApplication(); // no app should have focus at this point
1988
169
        }
140
        }
1989
170
141
1990
171
        function focusNext() {
142
        function focusNext() {
1991
172
            ApplicationManager.unfocusCurrentApplication();
1992
173
            for (var i = 0; i < appRepeater.count; i++) {
143
            for (var i = 0; i < appRepeater.count; i++) {
1993
174
                var appDelegate = appRepeater.itemAt(i);
144
                var appDelegate = appRepeater.itemAt(i);
1994
175
                if (appDelegate && !appDelegate.minimized) {
145
                if (appDelegate && !appDelegate.minimized) {
1996
176
                    ApplicationManager.focusApplication(appDelegate.appId);
146
                    appDelegate.focus = true;
1997
177
                    return;
147
                    return;
1998
178
                }
148
                }
1999
179
            }
149
            }
2000
@@ -182,15 +152,14 @@
2001
182
152
2002
183
    Connections {
153
    Connections {
2003
184
        target: PanelState
154
        target: PanelState
2006
185
        onClose: {
155
        onClose: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.close(); } }
2007
186
            ApplicationManager.stopApplication(ApplicationManager.focusedApplicationId)
156
        onMinimize: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.minimize(); } }
2008
157
        onMaximize: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.restoreFromMaximized(); } }
2009
158
        onFocusMaximizedApp: {
2010
159
            if (priv.foregroundMaximizedAppDelegate) {
2011
160
                priv.foregroundMaximizedAppDelegate.focus = true;
2012
161
             }
2013
187
        }
162
        }
2014
188
        onMinimize: priv.focusedAppDelegate && priv.focusedAppDelegate.minimize();
2015
189
        onMaximize: priv.focusedAppDelegate // don't restore minimized apps when double clicking the panel
2016
190
                    && priv.focusedAppDelegate.restoreFromMaximized();
2017
191
        onFocusMaximizedApp: if (priv.foregroundMaximizedAppIndex != -1) {
2018
192
                                 ApplicationManager.focusApplication(appRepeater.itemAt(priv.foregroundMaximizedAppIndex).appId);
2019
193
                             }
2020
194
    }
163
    }
2021
195
164
2022
196
    Binding {
165
    Binding {
2023
@@ -218,7 +187,7 @@
2024
218
    Binding {
187
    Binding {
2025
219
        target: PanelState
188
        target: PanelState
2026
220
        property: "dropShadow"
189
        property: "dropShadow"
2028
221
        value: priv.focusedAppDelegate && !priv.focusedAppDelegate.maximized && priv.foregroundMaximizedAppIndex !== -1
190
        value: priv.focusedAppDelegate && !priv.focusedAppDelegate.maximized && priv.foregroundMaximizedAppDelegate !== null
2029
222
    }
191
    }
2030
223
192
2031
224
    Component.onDestruction: {
193
    Component.onDestruction: {
2032
@@ -227,6 +196,27 @@
2033
227
        PanelState.dropShadow = false;
196
        PanelState.dropShadow = false;
2034
228
    }
197
    }
2035
229
198
2036
199
    Instantiator {
2037
200
        model: root.applicationManager
2038
201
        delegate: Binding {
2039
202
            target: model.application
2040
203
            property: "requestedState"
2041
204
2042
205
            // TODO: figure out some lifecycle policy, like suspending minimized apps
2043
206
            //       if running on a tablet or something.
2044
207
            // TODO: If the device has a dozen suspended apps because it was running
2045
208
            //       in staged mode, when it switches to Windowed mode it will suddenly
2046
209
            //       resume all those apps at once. We might want to avoid that.
2047
210
            value: ApplicationInfoInterface.RequestedRunning // Always running for now
2048
211
        }
2049
212
    }
2050
213
2051
214
    Binding {
2052
215
        target: MirFocusController
2053
216
        property: "focusedSurface"
2054
217
        value: priv.focusedAppDelegate ? priv.focusedAppDelegate.surface : null
2055
218
        when: !appRepeater.startingUp && root.parent
2056
219
    }
2057
230
220
2058
231
    FocusScope {
221
    FocusScope {
2059
232
        id: appContainer
222
        id: appContainer
2060
@@ -242,20 +232,25 @@
2061
242
            fillMode: Image.PreserveAspectCrop
232
            fillMode: Image.PreserveAspectCrop
2062
243
        }
233
        }
2063
244
234
2065
245
        Repeater {
235
        TopLevelSurfaceRepeater {
2066
246
            id: appRepeater
236
            id: appRepeater
2068
247
            model: ApplicationManager
237
            model: topLevelSurfaceList
2069
248
            objectName: "appRepeater"
238
            objectName: "appRepeater"
2070
249
239
2071
250
            delegate: FocusScope {
240
            delegate: FocusScope {
2072
251
                id: appDelegate
241
                id: appDelegate
2074
252
                objectName: "appDelegate_" + appId
242
                objectName: "appDelegate_" + model.id
2075
253
                // z might be overriden in some cases by effects, but we need z ordering
243
                // z might be overriden in some cases by effects, but we need z ordering
2076
254
                // to calculate occlusion detection
244
                // to calculate occlusion detection
2078
255
                property int normalZ: ApplicationManager.count - index
245
                property int normalZ: topLevelSurfaceList.count - index
2079
246
                onNormalZChanged: {
2080
247
                    if (visuallyMaximized) {
2081
248
                        priv.updateForegroundMaximizedApp();
2082
249
                    }
2083
250
                }
2084
256
                z: normalZ
251
                z: normalZ
2085
257
                y: PanelState.panelHeight
252
                y: PanelState.panelHeight
2087
258
                focus: appId === priv.focusedAppId
253
2088
259
                width: decoratedWindow.width
254
                width: decoratedWindow.width
2089
260
                height: decoratedWindow.height
255
                height: decoratedWindow.height
2090
261
                property int requestedWidth: -1
256
                property int requestedWidth: -1
2091
@@ -280,36 +275,99 @@
2092
280
                readonly property alias minimized: appDelegatePrivate.minimized
275
                readonly property alias minimized: appDelegatePrivate.minimized
2093
281
                readonly property alias fullscreen: decoratedWindow.fullscreen
276
                readonly property alias fullscreen: decoratedWindow.fullscreen
2094
282
277
2096
283
                readonly property string appId: model.appId
278
                readonly property var application: model.application
2097
284
                property bool animationsEnabled: true
279
                property bool animationsEnabled: true
2098
285
                property alias title: decoratedWindow.title
280
                property alias title: decoratedWindow.title
2100
286
                readonly property string appName: model.name
281
                readonly property string appName: model.application ? model.application.name : ""
2101
287
                property bool visuallyMaximized: false
282
                property bool visuallyMaximized: false
2102
288
                property bool visuallyMinimized: false
283
                property bool visuallyMinimized: false
2103
289
284
2104
285
                readonly property var surface: model.surface
2105
286
2106
287
                function claimFocus() {
2107
288
                    if (spread.state == "altTab") {
2108
289
                        spread.cancel();
2109
290
                    }
2110
291
                    appDelegate.restore();
2111
292
                }
2112
293
                Connections {
2113
294
                    target: model.surface
2114
295
                    onFocusRequested: claimFocus();
2115
296
                }
2116
297
                Connections {
2117
298
                    target: model.application
2118
299
                    onFocusRequested: {
2119
300
                        if (!model.surface) {
2120
301
                            // when an app has no surfaces, we assume there's only one entry representing it:
2121
302
                            // this delegate.
2122
303
                            claimFocus();
2123
304
                        } else {
2124
305
                            // if the application has surfaces, focus request should be at surface-level.
2125
306
                        }
2126
307
                    }
2127
308
                }
2128
309
2129
290
                onFocusChanged: {
310
                onFocusChanged: {
2132
291
                    if (focus && ApplicationManager.focusedApplicationId !== appId) {
311
                    if (appRepeater.startingUp)
2133
292
                        ApplicationManager.focusApplication(appId);
312
                        return;
2134
313
2135
314
                    if (focus) {
2136
315
                        priv.focusedAppDelegate = appDelegate;
2137
316
2138
317
                        // If we're orphan (!parent) it means this stage is no longer the current one
2139
318
                        // and will be deleted shortly. So we should no longer have a say over the model
2140
319
                        if (root.parent) {
2141
320
                            topLevelSurfaceList.raiseId(model.id);
2142
321
                        }
2143
322
                    } else if (!focus && priv.focusedAppDelegate === appDelegate) {
2144
323
                        priv.focusedAppDelegate = null;
2145
324
                        // FIXME: No idea why the Binding{} doens't update when focusedAppDelegate turns null
2146
325
                        MirFocusController.focusedSurface = null;
2147
326
                    }
2148
327
                }
2149
328
                Component.onCompleted: {
2150
329
                    // NB: We're differentiating if this delegate was created in response to a new entry in the model
2151
330
                    //     or if the Repeater is just populating itself with delegates to match the model it received.
2152
331
                    if (!appRepeater.startingUp) {
2153
332
                        // a top level window is always the focused one when it first appears, unfocusing
2154
333
                        // any preexisting one
2155
334
                        focus = true;
2156
335
                    }
2157
336
                }
2158
337
                Component.onDestruction: {
2159
338
                    if (!root.parent) {
2160
339
                        // This stage is about to be destroyed. Don't mess up with the model at this point
2161
340
                        return;
2162
341
                    }
2163
342
2164
343
                    if (visuallyMaximized) {
2165
344
                        priv.updateForegroundMaximizedApp();
2166
345
                    }
2167
346
2168
347
                    if (focus) {
2169
348
                        // focus some other window
2170
349
                        for (var i = 0; i < appRepeater.count; i++) {
2171
350
                            var appDelegate = appRepeater.itemAt(i);
2172
351
                            if (appDelegate && !appDelegate.minimized && i != index) {
2173
352
                                appDelegate.focus = true;
2174
353
                                return;
2175
354
                            }
2176
355
                        }
2177
293
                    }
356
                    }
2178
294
                }
357
                }
2179
295
358
2180
296
                onVisuallyMaximizedChanged: priv.updateForegroundMaximizedApp()
359
                onVisuallyMaximizedChanged: priv.updateForegroundMaximizedApp()
2181
297
360
2187
298
                visible: !visuallyMinimized &&
361
                visible: (
2188
299
                         !greeter.fullyShown &&
362
                          !visuallyMinimized
2189
300
                         (priv.foregroundMaximizedAppZ === -1 || priv.foregroundMaximizedAppZ <= z) ||
363
                          && !greeter.fullyShown
2190
301
                         decoratedWindow.fullscreen ||
364
                          && (priv.foregroundMaximizedAppDelegate === null || priv.foregroundMaximizedAppDelegate.normalZ <= z)
2191
302
                         (spread.state == "altTab" && index === spread.highlightedIndex)
365
                         )
2192
366
                         || decoratedWindow.fullscreen
2193
367
                         || (spread.state == "altTab" && index === spread.highlightedIndex)
2194
303
368
2204
304
                Binding {
369
                function close() {
2205
305
                    target: ApplicationManager.get(index)
370
                    model.surface.close();
2197
306
                    property: "requestedState"
2198
307
                    // TODO: figure out some lifecycle policy, like suspending minimized apps
2199
308
                    //       if running on a tablet or something.
2200
309
                    // TODO: If the device has a dozen suspended apps because it was running
2201
310
                    //       in staged mode, when it switches to Windowed mode it will suddenly
2202
311
                    //       resume all those apps at once. We might want to avoid that.
2203
312
                    value: ApplicationInfoInterface.RequestedRunning // Always running for now
2206
313
                }
371
                }
2207
314
372
2208
315
                function maximize(animated) {
373
                function maximize(animated) {
2209
@@ -351,7 +409,8 @@
2210
351
                        maximizeLeft();
409
                        maximizeLeft();
2211
352
                    else if (maximizedRight)
410
                    else if (maximizedRight)
2212
353
                        maximizeRight();
411
                        maximizeRight();
2214
354
                    ApplicationManager.focusApplication(appId);
412
2215
413
                    focus = true;
2216
355
                }
414
                }
2217
356
415
2218
357
                function playFocusAnimation() {
416
                function playFocusAnimation() {
2219
@@ -369,7 +428,7 @@
2220
369
428
2221
370
                states: [
429
                states: [
2222
371
                    State {
430
                    State {
2224
372
                        name: "fullscreen"; when: decoratedWindow.fullscreen
431
                        name: "fullscreen"; when: decoratedWindow.fullscreen && !appDelegate.minimized
2225
373
                        PropertyChanges {
432
                        PropertyChanges {
2226
374
                            target: appDelegate;
433
                            target: appDelegate;
2227
375
                            x: 0;
434
                            x: 0;
2228
@@ -462,6 +521,7 @@
2229
462
                            ScriptAction {
521
                            ScriptAction {
2230
463
                                script: {
522
                                script: {
2231
464
                                    if (appDelegate.minimized) {
523
                                    if (appDelegate.minimized) {
2232
524
                                        appDelegate.focus = false;
2233
465
                                        priv.focusNext();
525
                                        priv.focusNext();
2234
466
                                    }
526
                                    }
2235
467
                                }
527
                                }
2236
@@ -486,7 +546,7 @@
2237
486
                    id: previewBinding
546
                    id: previewBinding
2238
487
                    target: appDelegate
547
                    target: appDelegate
2239
488
                    property: "z"
548
                    property: "z"
2241
489
                    value: ApplicationManager.count + 1
549
                    value: topLevelSurfaceList.count + 1
2242
490
                    when: index == spread.highlightedIndex && spread.ready
550
                    when: index == spread.highlightedIndex && spread.ready
2243
491
                }
551
                }
2244
492
552
2245
@@ -497,12 +557,12 @@
2246
497
                    minWidth: units.gu(10)
557
                    minWidth: units.gu(10)
2247
498
                    minHeight: units.gu(10)
558
                    minHeight: units.gu(10)
2248
499
                    borderThickness: units.gu(2)
559
                    borderThickness: units.gu(2)
2250
500
                    windowId: model.appId // FIXME: Change this to point to windowId once we have such a thing
560
                    windowId: model.application.appId // FIXME: Change this to point to windowId once we have such a thing
2251
501
                    screenWidth: appContainer.width
561
                    screenWidth: appContainer.width
2252
502
                    screenHeight: appContainer.height
562
                    screenHeight: appContainer.height
2253
503
                    leftMargin: root.leftMargin
563
                    leftMargin: root.leftMargin
2254
504
564
2256
505
                    onPressed: { ApplicationManager.focusApplication(model.appId) }
565
                    onPressed: { appDelegate.focus = true; }
2257
506
566
2258
507
                    Component.onCompleted: {
567
                    Component.onCompleted: {
2259
508
                        loadWindowState();
568
                        loadWindowState();
2260
@@ -529,24 +589,25 @@
2261
529
                    objectName: "decoratedWindow"
589
                    objectName: "decoratedWindow"
2262
530
                    anchors.left: appDelegate.left
590
                    anchors.left: appDelegate.left
2263
531
                    anchors.top: appDelegate.top
591
                    anchors.top: appDelegate.top
2266
532
                    application: ApplicationManager.get(index)
592
                    application: model.application
2267
533
                    active: ApplicationManager.focusedApplicationId === model.appId
593
                    surface: model.surface
2268
594
                    active: appDelegate.focus
2269
534
                    focus: true
595
                    focus: true
2270
535
596
2271
536
                    requestedWidth: appDelegate.requestedWidth
597
                    requestedWidth: appDelegate.requestedWidth
2272
537
                    requestedHeight: appDelegate.requestedHeight
598
                    requestedHeight: appDelegate.requestedHeight
2273
538
599
2275
539
                    onClose: ApplicationManager.stopApplication(model.appId)
600
                    onClose: { appDelegate.close(); }
2276
540
                    onMaximize: appDelegate.maximized || appDelegate.maximizedLeft || appDelegate.maximizedRight
601
                    onMaximize: appDelegate.maximized || appDelegate.maximizedLeft || appDelegate.maximizedRight
2277
541
                                ? appDelegate.restoreFromMaximized() : appDelegate.maximize()
602
                                ? appDelegate.restoreFromMaximized() : appDelegate.maximize()
2278
542
                    onMinimize: appDelegate.minimize()
603
                    onMinimize: appDelegate.minimize()
2280
543
                    onDecorationPressed: { ApplicationManager.focusApplication(model.appId) }
604
                    onDecorationPressed: { appDelegate.focus = true; }
2281
544
                }
605
                }
2282
545
606
2283
546
                WindowedFullscreenPolicy {
607
                WindowedFullscreenPolicy {
2284
547
                    id: fullscreenPolicy
608
                    id: fullscreenPolicy
2285
548
                    active: true
609
                    active: true
2287
549
                    application: decoratedWindow.application
610
                    surface: model.surface
2288
550
                }
611
                }
2289
551
            }
612
            }
2290
552
        }
613
        }
2291
553
614
2292
=== modified file 'qml/Stages/PhoneStage.qml'
2293
--- qml/Stages/PhoneStage.qml	2016-04-20 17:09:15 +0000
2294
+++ qml/Stages/PhoneStage.qml	2016-04-20 17:09:16 +0000
2295
@@ -26,7 +26,6 @@
2296
26
AbstractStage {
26
AbstractStage {
2297
27
    id: root
27
    id: root
2298
28
28
2299
29
    property QtObject applicationManager: ApplicationManager
2300
30
    property bool focusFirstApp: true // If false, focused app will appear on right edge like other apps
29
    property bool focusFirstApp: true // If false, focused app will appear on right edge like other apps
2301
31
    property bool altTabEnabled: true
30
    property bool altTabEnabled: true
2302
32
    property real startScale: 1.1
31
    property real startScale: 1.1
2303
@@ -107,9 +106,7 @@
2304
107
        }
106
        }
2305
108
    }
107
    }
2306
109
108
2310
110
    mainApp: applicationManager.focusedApplicationId
109
    mainApp: priv.focusedAppDelegate ? priv.focusedAppDelegate.application : null
2308
111
            ? applicationManager.findApplication(applicationManager.focusedApplicationId)
2309
112
            : null
2311
113
110
2312
114
    orientationChangesEnabled: priv.focusedAppOrientationChangesEnabled
111
    orientationChangesEnabled: priv.focusedAppOrientationChangesEnabled
2313
115
                               && !priv.focusedAppDelegateIsDislocated
112
                               && !priv.focusedAppDelegateIsDislocated
2314
@@ -158,72 +155,27 @@
2315
158
        onTriggered: { root.beingResized = false; }
155
        onTriggered: { root.beingResized = false; }
2316
159
    }
156
    }
2317
160
157
2318
161
    Connections {
2319
162
        target: applicationManager
2320
163
2321
164
        onFocusRequested: {
2322
165
            if (spreadView.phase > 0) {
2323
166
                spreadView.snapTo(priv.indexOf(appId));
2324
167
            } else {
2325
168
                applicationManager.focusApplication(appId);
2326
169
            }
2327
170
        }
2328
171
2329
172
        onApplicationAdded: {
2330
173
            if (spreadView.phase == 2) {
2331
174
                spreadView.snapTo(applicationManager.count - 1);
2332
175
            } else {
2333
176
                spreadView.phase = 0;
2334
177
                spreadView.contentX = -spreadView.shift;
2335
178
                applicationManager.focusApplication(appId);
2336
179
            }
2337
180
        }
2338
181
2339
182
        onApplicationRemoved: {
2340
183
            // Unless we're closing the app ourselves in the spread,
2341
184
            // lets make sure the spread doesn't mess up by the changing app list.
2342
185
            if (spreadView.closingIndex == -1) {
2343
186
                spreadView.phase = 0;
2344
187
                spreadView.contentX = -spreadView.shift;
2345
188
                focusTopMostApp();
2346
189
            }
2347
190
        }
2348
191
2349
192
        function focusTopMostApp() {
2350
193
            if (applicationManager.count > 0) {
2351
194
                var topmostApp = applicationManager.get(0);
2352
195
                applicationManager.focusApplication(topmostApp.appId);
2353
196
            }
2354
197
        }
2355
198
    }
2356
199
2357
200
    QtObject {
158
    QtObject {
2358
201
        id: priv
159
        id: priv
2359
202
160
2360
203
        property string focusedAppId: root.applicationManager.focusedApplicationId
2361
204
        property bool focusedAppOrientationChangesEnabled: false
161
        property bool focusedAppOrientationChangesEnabled: false
2362
205
        readonly property int firstSpreadIndex: root.focusFirstApp ? 1 : 0
162
        readonly property int firstSpreadIndex: root.focusFirstApp ? 1 : 0
2367
206
        readonly property var focusedAppDelegate: {
163
        property var focusedAppDelegate
2368
207
            var index = indexOf(focusedAppId);
164
        // NB! This may differ from applicationManager.focusedApplicationId if focusedAppDelegate
2369
208
            return index >= 0 && index < spreadRepeater.count ? spreadRepeater.itemAt(index) : null
165
        // contains a screenshot instead of a surface.
2370
209
        }
166
        property string focusedAppId: focusedAppDelegate ? focusedAppDelegate.application.appId : ""
2371
210
167
2372
211
        property real oldInverseProgress: 0
168
        property real oldInverseProgress: 0
2373
212
        property bool animateX: false
169
        property bool animateX: false
2374
213
        property int highlightIndex: 0
170
        property int highlightIndex: 0
2375
214
171
2383
215
        onFocusedAppDelegateChanged: {
172
        property bool focusedAppDelegateIsDislocated: focusedAppDelegate ?
2377
216
            if (focusedAppDelegate) {
2378
217
                focusedAppDelegate.focus = true;
2379
218
            }
2380
219
        }
2381
220
2382
221
        property bool focusedAppDelegateIsDislocated: focusedAppDelegate &&
2384
222
                                                      (focusedAppDelegate.x !== 0 || focusedAppDelegate.xBehavior.running)
173
                                                      (focusedAppDelegate.x !== 0 || focusedAppDelegate.xBehavior.running)
2385
174
                                                      : false
2386
223
175
2387
224
        function indexOf(appId) {
176
        function indexOf(appId) {
2390
225
            for (var i = 0; i < root.applicationManager.count; i++) {
177
            for (var i = 0; i < spreadRepeater.count; i++) {
2391
226
                if (root.applicationManager.get(i).appId == appId) {
178
                if (spreadRepeater.itemAt(i).application.appId == appId) {
2392
227
                    return i;
179
                    return i;
2393
228
                }
180
                }
2394
229
            }
181
            }
2395
@@ -237,8 +189,8 @@
2396
237
        function reset() {
189
        function reset() {
2397
238
            // The app that's about to go to foreground has to be focused, otherwise
190
            // The app that's about to go to foreground has to be focused, otherwise
2398
239
            // it would leave us in an inconsistent state.
191
            // it would leave us in an inconsistent state.
2401
240
            if (!root.applicationManager.focusedApplicationId && root.applicationManager.count > 0) {
192
            if (!MirFocusController.focusedSurface && spreadRepeater.count > 0) {
2402
241
                root.applicationManager.focusApplication(root.applicationManager.get(0).appId);
193
                spreadRepeater.itemAt(0).focus = true;
2403
242
            }
194
            }
2404
243
195
2405
244
            spreadView.selectedIndex = -1;
196
            spreadView.selectedIndex = -1;
2406
@@ -258,6 +210,36 @@
2407
258
        }
210
        }
2408
259
    }
211
    }
2409
260
212
2410
213
    Instantiator {
2411
214
        model: root.applicationManager
2412
215
        delegate: QtObject {
2413
216
            property var stateBinding: Binding {
2414
217
                readonly property bool isDash: model.application ? model.application.appId == "unity8-dash" : false
2415
218
                target: model.application
2416
219
                property: "requestedState"
2417
220
                value: (isDash && root.keepDashRunning)
2418
221
                           || (!root.suspended && model.application && priv.focusedAppId === model.application.appId)
2419
222
                       ? ApplicationInfoInterface.RequestedRunning
2420
223
                       : ApplicationInfoInterface.RequestedSuspended
2421
224
            }
2422
225
2423
226
            property var lifecycleBinding: Binding {
2424
227
                target: model.application
2425
228
                property: "exemptFromLifecycle"
2426
229
                value: model.application
2427
230
                            ? (!model.application.isTouchApp || isExemptFromLifecycle(model.application.appId))
2428
231
                            : false
2429
232
            }
2430
233
        }
2431
234
    }
2432
235
2433
236
    Binding {
2434
237
        target: MirFocusController
2435
238
        property: "focusedSurface"
2436
239
        value: priv.focusedAppDelegate ? priv.focusedAppDelegate.surface : null
2437
240
        when: root.parent && !spreadRepeater.startingUp
2438
241
    }
2439
242
2440
261
    Flickable {
243
    Flickable {
2441
262
        id: spreadView
244
        id: spreadView
2442
263
        objectName: "spreadView"
245
        objectName: "spreadView"
2443
@@ -308,13 +290,38 @@
2444
308
        // rely on having Flickable.contentX keeping an out-of-bounds value when it's set programatically
290
        // rely on having Flickable.contentX keeping an out-of-bounds value when it's set programatically
2445
309
        // (as opposed to having contentX reaching an out-of-bounds value through dragging, which will trigger
291
        // (as opposed to having contentX reaching an out-of-bounds value through dragging, which will trigger
2446
310
        // the Flickable.boundsBehavior upon release).
292
        // the Flickable.boundsBehavior upon release).
2448
311
        onContentXChanged: { forceItToRemainStillIfBeingResized(); }
293
        onContentXChanged: {
2449
294
            if (!undoContentXReset()) {
2450
295
                forceItToRemainStillIfBeingResized();
2451
296
            }
2452
297
        }
2453
312
        onShiftChanged: { forceItToRemainStillIfBeingResized(); }
298
        onShiftChanged: { forceItToRemainStillIfBeingResized(); }
2454
313
        function forceItToRemainStillIfBeingResized() {
299
        function forceItToRemainStillIfBeingResized() {
2455
314
            if (root.beingResized && contentX != -spreadView.shift) {
300
            if (root.beingResized && contentX != -spreadView.shift) {
2456
315
                contentX = -spreadView.shift;
301
                contentX = -spreadView.shift;
2457
316
            }
302
            }
2458
317
        }
303
        }
2459
304
        function undoContentXReset() {
2460
305
            if (contentWidth <= 0) {
2461
306
                contentWidthOnLastContentXChange = contentWidth;
2462
307
                lastContentX = contentX;
2463
308
                return false;
2464
309
            }
2465
310
2466
311
            if (contentWidth !== contentWidthOnLastContentXChange
2467
312
                    && lastContentX === -shift && contentX === 0) {
2468
313
                // Flickable is resetting contentX because contentWidth has changed. Undo it.
2469
314
                contentX = -shift;
2470
315
                return true;
2471
316
            }
2472
317
2473
318
            contentWidthOnLastContentXChange = contentWidth;
2474
319
            lastContentX = contentX;
2475
320
            return false;
2476
321
        }
2477
322
        property real contentWidthOnLastContentXChange: -1
2478
323
        property real lastContentX: 0
2479
324
        // </FIXME-contentX>
2480
318
325
2481
319
        Behavior on contentX {
326
        Behavior on contentX {
2482
320
            enabled: root.altTabPressed
327
            enabled: root.altTabPressed
2483
@@ -377,7 +384,7 @@
2484
377
                snapAnimation.start();
384
                snapAnimation.start();
2485
378
                return;
385
                return;
2486
379
            }
386
            }
2488
380
            if (root.applicationManager.count <= index) {
387
            if (topLevelSurfaceList.count <= index) {
2489
381
                // In case we're trying to snap to some non existing app, lets snap back to the first one
388
                // In case we're trying to snap to some non existing app, lets snap back to the first one
2490
382
                index = 0;
389
                index = 0;
2491
383
            }
390
            }
2492
@@ -414,7 +421,8 @@
2493
414
            ScriptAction {
421
            ScriptAction {
2494
415
                script: {
422
                script: {
2495
416
                    if (spreadView.selectedIndex >= 0) {
423
                    if (spreadView.selectedIndex >= 0) {
2497
417
                        root.applicationManager.focusApplication(root.applicationManager.get(spreadView.selectedIndex).appId);
424
                        var delegate = spreadRepeater.itemAt(spreadView.selectedIndex)
2498
425
                        delegate.focus = true;
2499
418
426
2500
419
                        spreadView.selectedIndex = -1;
427
                        spreadView.selectedIndex = -1;
2501
420
                        spreadView.phase = 0;
428
                        spreadView.phase = 0;
2502
@@ -429,7 +437,7 @@
2503
429
            // This width controls how much the spread can be flicked left/right. It's composed of:
437
            // This width controls how much the spread can be flicked left/right. It's composed of:
2504
430
            //  tileDistance * app count (with a minimum of 3 apps, in order to also allow moving 1 and 2 apps a bit)
438
            //  tileDistance * app count (with a minimum of 3 apps, in order to also allow moving 1 and 2 apps a bit)
2505
431
            //  + some constant value (still scales with the screen width) which looks good and somewhat fills the screen
439
            //  + some constant value (still scales with the screen width) which looks good and somewhat fills the screen
2507
432
            width: Math.max(3, root.applicationManager.count) * spreadView.tileDistance + (spreadView.width - spreadView.tileDistance) * 1.5
440
            width: Math.max(3, topLevelSurfaceList.count) * spreadView.tileDistance + (spreadView.width - spreadView.tileDistance) * 1.5
2508
433
            height: parent.height
441
            height: parent.height
2509
434
            Behavior on width {
442
            Behavior on width {
2510
435
                enabled: spreadView.closingIndex >= 0
443
                enabled: spreadView.closingIndex >= 0
2511
@@ -449,13 +457,30 @@
2512
449
                }
457
                }
2513
450
            }
458
            }
2514
451
459
2516
452
            Repeater {
460
            TopLevelSurfaceRepeater {
2517
453
                id: spreadRepeater
461
                id: spreadRepeater
2518
454
                objectName: "spreadRepeater"
462
                objectName: "spreadRepeater"
2520
455
                model: root.applicationManager
463
                model: topLevelSurfaceList
2521
464
2522
465
                onItemRemoved: {
2523
466
                    // Unless we're closing the app ourselves in the spread,
2524
467
                    // lets make sure the spread doesn't mess up by the changing app list.
2525
468
                    if (spreadView.closingIndex == -1) {
2526
469
                        spreadView.phase = 0;
2527
470
                        spreadView.contentX = -spreadView.shift;
2528
471
                        focusTopMostApp();
2529
472
                    }
2530
473
                }
2531
474
                function focusTopMostApp() {
2532
475
                    if (spreadRepeater.count > 0) {
2533
476
                        var topmostDelegate = spreadRepeater.itemAt(0);
2534
477
                        topmostDelegate.focus = true;
2535
478
                    }
2536
479
                }
2537
480
2538
456
                delegate: TransformedSpreadDelegate {
481
                delegate: TransformedSpreadDelegate {
2539
457
                    id: appDelegate
482
                    id: appDelegate
2541
458
                    objectName: "appDelegate" + index
483
                    objectName: "spreadDelegate_" + model.id
2542
459
                    startAngle: 45
484
                    startAngle: 45
2543
460
                    endAngle: 5
485
                    endAngle: 5
2544
461
                    startScale: root.startScale
486
                    startScale: root.startScale
2545
@@ -467,28 +492,61 @@
2546
467
                    selected: spreadView.selectedIndex == index
492
                    selected: spreadView.selectedIndex == index
2547
468
                    otherSelected: spreadView.selectedIndex >= 0 && !selected
493
                    otherSelected: spreadView.selectedIndex >= 0 && !selected
2548
469
                    interactive: !spreadView.interactive && spreadView.phase === 0
494
                    interactive: !spreadView.interactive && spreadView.phase === 0
2550
470
                            && priv.fullyShowingFocusedApp && root.interactive && isFocused
495
                            && priv.fullyShowingFocusedApp && root.interactive && focus
2551
471
                    swipeToCloseEnabled: spreadView.interactive && root.interactive && !snapAnimation.running
496
                    swipeToCloseEnabled: spreadView.interactive && root.interactive && !snapAnimation.running
2552
472
                    maximizedAppTopMargin: root.maximizedAppTopMargin
497
                    maximizedAppTopMargin: root.maximizedAppTopMargin
2553
473
                    dropShadow: spreadView.active || priv.focusedAppDelegateIsDislocated
498
                    dropShadow: spreadView.active || priv.focusedAppDelegateIsDislocated
2554
474
                    focusFirstApp: root.focusFirstApp
499
                    focusFirstApp: root.focusFirstApp
2555
475
                    highlightShown: root.altTabPressed && index === priv.highlightIndex
500
                    highlightShown: root.altTabPressed && index === priv.highlightIndex
2556
476
501
2572
477
                    readonly property bool isDash: model.appId == "unity8-dash"
502
                    readonly property bool isDash: model.application.appId == "unity8-dash"
2573
478
503
2574
479
                    Binding {
504
                    Component.onCompleted: {
2575
480
                        target: appDelegate.application
505
                        // NB: We're differentiating if this delegate was created in response to a new entry in the model
2576
481
                        property: "exemptFromLifecycle"
506
                        //     or if the Repeater is just populating itself with delegates to match the model it received.
2577
482
                        value: !model.isTouchApp || isExemptFromLifecycle(model.appId)
507
                        if (!spreadRepeater.startingUp) {
2578
483
                    }
508
                            // a top level window is always the focused one when it first appears, unfocusing
2579
484
509
                            // any preexisting one
2580
485
                    Binding {
510
                            //
2581
486
                        target: appDelegate.application
511
                            // new items are appended and must be manually brought to front.
2582
487
                        property: "requestedState"
512
                            // that's how it *must* be in order to get the animation for new
2583
488
                        value: (isDash && root.keepDashRunning)
513
                            // surfaces working
2584
489
                                   || (!root.suspended && appDelegate.focus)
514
                            claimFocus();
2585
490
                               ? ApplicationInfoInterface.RequestedRunning
515
                        }
2586
491
                               : ApplicationInfoInterface.RequestedSuspended
516
                    }
2587
517
2588
518
                    onFocusChanged: {
2589
519
                        if (focus && !spreadRepeater.startingUp) {
2590
520
                            priv.focusedAppDelegate = appDelegate;
2591
521
                            // If we're orphan (!parent) it means this stage is no longer the current one
2592
522
                            // and will be deleted shortly. So we should no longer have a say over the model
2593
523
                            if (root.parent) {
2594
524
                                topLevelSurfaceList.raiseId(model.id);
2595
525
                            }
2596
526
                        }
2597
527
                    }
2598
528
                    function claimFocus() {
2599
529
                        if (spreadView.phase > 0) {
2600
530
                            spreadView.snapTo(model.index);
2601
531
                        } else {
2602
532
                            appDelegate.focus = true;
2603
533
                        }
2604
534
                    }
2605
535
                    Connections {
2606
536
                        target: model.surface
2607
537
                        onFocusRequested: claimFocus()
2608
538
                    }
2609
539
                    Connections {
2610
540
                        target: model.application
2611
541
                        onFocusRequested: {
2612
542
                            if (!model.surface) {
2613
543
                                // when an app has no surfaces, we assume there's only one entry representing it:
2614
544
                                // this delegate.
2615
545
                                claimFocus();
2616
546
                            } else {
2617
547
                                // if the application has surfaces, focus request should be at surface-level.
2618
548
                            }
2619
549
                        }
2620
492
                    }
550
                    }
2621
493
551
2622
494
                    z: isDash && !spreadView.active ? -1 : behavioredIndex
552
                    z: isDash && !spreadView.active ? -1 : behavioredIndex
2623
@@ -509,7 +567,8 @@
2624
509
                        return spreadView.width + spreadIndex * spreadView.tileDistance;
567
                        return spreadView.width + spreadIndex * spreadView.tileDistance;
2625
510
                    }
568
                    }
2626
511
569
2628
512
                    application: root.applicationManager.get(index)
570
                    application: model.application
2629
571
                    surface: model.surface
2630
513
                    closeable: !isDash
572
                    closeable: !isDash
2631
514
573
2632
515
                    property real behavioredIndex: index
574
                    property real behavioredIndex: index
2633
@@ -593,11 +652,7 @@
2634
593
652
2635
594
                    onClicked: {
653
                    onClicked: {
2636
595
                        if (root.altTabEnabled && spreadView.phase == 2) {
654
                        if (root.altTabEnabled && spreadView.phase == 2) {
2642
596
                            if (root.applicationManager.focusedApplicationId == root.applicationManager.get(index).appId) {
655
                            spreadView.snapTo(index);
2638
597
                                spreadView.snapTo(index);
2639
598
                            } else {
2640
599
                                root.applicationManager.requestFocusApplication(root.applicationManager.get(index).appId);
2641
600
                            }
2643
601
                        }
656
                        }
2644
602
                    }
657
                    }
2645
603
658
2646
@@ -611,7 +666,15 @@
2647
611
666
2648
612
                    onClosed: {
667
                    onClosed: {
2649
613
                        spreadView.closingIndex = index;
668
                        spreadView.closingIndex = index;
2651
614
                        root.applicationManager.stopApplication(root.applicationManager.get(index).appId);
669
                        if (appDelegate.surface) {
2652
670
                            appDelegate.surface.close();
2653
671
                        } else if (appDelegate.application) {
2654
672
                            root.applicationManager.stopApplication(appDelegate.application.appId);
2655
673
                        } else {
2656
674
                            // should never happen
2657
675
                            console.warn("Can't close topLevelSurfaceList entry as it has neither"
2658
676
                                         + " a surface nor an application");
2659
677
                        }
2660
615
                    }
678
                    }
2661
616
679
2662
617
                    Binding {
680
                    Binding {
2663
@@ -629,7 +692,7 @@
2664
629
692
2665
630
                    StagedFullscreenPolicy {
693
                    StagedFullscreenPolicy {
2666
631
                        id: fullscreenPolicy
694
                        id: fullscreenPolicy
2668
632
                        application: appDelegate.application
695
                        surface: model.surface
2669
633
                    }
696
                    }
2670
634
697
2671
635
                    Connections {
698
                    Connections {
2672
@@ -637,7 +700,7 @@
2673
637
                        onStageAboutToBeUnloaded: fullscreenPolicy.active = false
700
                        onStageAboutToBeUnloaded: fullscreenPolicy.active = false
2674
638
                    }
701
                    }
2675
639
                }
702
                }
2677
640
            }
703
            } // Repeater {
2678
641
        }
704
        }
2679
642
    }
705
    }
2680
643
706
2681
644
707
2682
=== added file 'qml/Stages/PromptSurfaceAnimations.qml'
2683
--- qml/Stages/PromptSurfaceAnimations.qml	1970-01-01 00:00:00 +0000
2684
+++ qml/Stages/PromptSurfaceAnimations.qml	2016-04-20 17:09:16 +0000
2685
@@ -0,0 +1,81 @@
2686
1
/*
2687
2
 * Copyright 2016 Canonical Ltd.
2688
3
 *
2689
4
 * This program is free software; you can redistribute it and/or modify
2690
5
 * it under the terms of the GNU Lesser General Public License as published by
2691
6
 * the Free Software Foundation; version 3.
2692
7
 *
2693
8
 * This program is distributed in the hope that it will be useful,
2694
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2695
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2696
11
 * GNU Lesser General Public License for more details.
2697
12
 *
2698
13
 * You should have received a copy of the GNU Lesser General Public License
2699
14
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2700
15
*/
2701
16
2702
17
import QtQuick 2.4
2703
18
import Ubuntu.Components 1.3
2704
19
2705
20
StateGroup {
2706
21
    id: root
2707
22
    property var container
2708
23
    property var surfaceItem
2709
24
2710
25
    states: [
2711
26
        State {
2712
27
            name: "blank"
2713
28
            when: !root.surfaceItem.surface
2714
29
        },
2715
30
        State {
2716
31
            name: "ready"
2717
32
            when: root.surfaceItem.surface && root.surfaceItem.live
2718
33
        },
2719
34
        State {
2720
35
            name: "zombie"
2721
36
            when: root.surfaceItem.surface && !root.surfaceItem.live
2722
37
        }
2723
38
    ]
2724
39
    transitions: [
2725
40
        Transition {
2726
41
            from: "*"; to: "zombie"
2727
42
            // Slide downwards until it's out of view, through the bottom of the window
2728
43
            SequentialAnimation {
2729
44
                // clip so we don't go out of parent's bounds during spread
2730
45
                PropertyAction { target: root.container.parent; property: "clip"; value: true }
2731
46
                UbuntuNumberAnimation { target: root.surfaceItem; property: "y"; to: root.container.height
2732
47
                                        duration: UbuntuAnimation.BriskDuration }
2733
48
                PropertyAction { target: root.surfaceItem; property: "visible"; value: false }
2734
49
                PropertyAction { target: container.parent; property: "clip"; value: false }
2735
50
                ScriptAction { script: {
2736
51
                    // Unity.Application can't destroy a zombie MirSurface if it's still being
2737
52
                    // referenced by a MirSurfaceItem.
2738
53
                    root.surfaceItem.surface = null;
2739
54
                } }
2740
55
            }
2741
56
        },
2742
57
        Transition {
2743
58
            from: "*"; to: "ready"
2744
59
            // Slide upwards into view, from the bottom of the window
2745
60
            SequentialAnimation {
2746
61
                // clip so we don't go out of parent's bounds during spread
2747
62
                PropertyAction { target: root.container.parent; property: "clip"; value: true }
2748
63
                ScriptAction { script: {
2749
64
                    root.surfaceItem.y = root.container.height;
2750
65
                    root.surfaceItem.visible = true;
2751
66
                } }
2752
67
                UbuntuNumberAnimation {
2753
68
                    target: root.surfaceItem; property: "y"; to: 0
2754
69
                    duration: UbuntuAnimation.BriskDuration
2755
70
                }
2756
71
                PropertyAction { target: container.parent; property: "clip"; value: false }
2757
72
            }
2758
73
        },
2759
74
        Transition {
2760
75
            from: "*"; to: "blank"
2761
76
            ScriptAction { script: {
2762
77
                root.surfaceItem.visible = false;
2763
78
            } }
2764
79
        }
2765
80
    ]
2766
81
}
2767
0
82
2768
=== modified file 'qml/Stages/SpreadDelegate.qml'
2769
--- qml/Stages/SpreadDelegate.qml	2016-04-20 17:09:15 +0000
2770
+++ qml/Stages/SpreadDelegate.qml	2016-04-20 17:09:16 +0000
2771
@@ -1,5 +1,5 @@
2772
1
/*
1
/*
2774
2
 * Copyright 2014-2015 Canonical Ltd.
2
 * Copyright 2014-2016 Canonical Ltd.
2775
3
 *
3
 *
2776
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
2777
5
 * it under the terms of the GNU Lesser General Public License as published by
5
 * it under the terms of the GNU Lesser General Public License as published by
2778
@@ -45,6 +45,7 @@
2779
45
    property alias swipeToCloseEnabled: dragArea.enabled
45
    property alias swipeToCloseEnabled: dragArea.enabled
2780
46
    property bool closeable
46
    property bool closeable
2781
47
    property alias application: appWindow.application
47
    property alias application: appWindow.application
2782
48
    property alias surface: appWindow.surface
2783
48
    property int shellOrientationAngle
49
    property int shellOrientationAngle
2784
49
    property int shellOrientation
50
    property int shellOrientation
2785
50
    property QtObject orientations
51
    property QtObject orientations
2786
@@ -250,7 +251,7 @@
2787
250
                    }
251
                    }
2788
251
                    PropertyChanges {
252
                    PropertyChanges {
2789
252
                        target: appWindow
253
                        target: appWindow
2791
253
                        surfaceOrientationAngle: orientationAngle
254
                        surfaceOrientationAngle: appWindowWithShadow.orientationAngle
2792
254
                    }
255
                    }
2793
255
                },
256
                },
2794
256
                State {
257
                State {
2795
@@ -292,7 +293,7 @@
2796
292
293
2797
293
            ApplicationWindow {
294
            ApplicationWindow {
2798
294
                id: appWindow
295
                id: appWindow
2800
295
                objectName: application ? "appWindow_" + application.appId : "appWindow_null"
296
                objectName: "appWindow"
2801
296
                focus: true
297
                focus: true
2802
297
                anchors {
298
                anchors {
2803
298
                    fill: parent
299
                    fill: parent
2804
299
300
2805
=== modified file 'qml/Stages/StagedFullscreenPolicy.qml'
2806
--- qml/Stages/StagedFullscreenPolicy.qml	2016-03-15 19:38:03 +0000
2807
+++ qml/Stages/StagedFullscreenPolicy.qml	2016-04-20 17:09:16 +0000
2808
@@ -27,31 +27,29 @@
2809
27
// Chrome not set and state change to fulscreen -> client window stays "fullscreen"
27
// Chrome not set and state change to fulscreen -> client window stays "fullscreen"
2810
28
QtObject {
28
QtObject {
2811
29
    property bool active: true
29
    property bool active: true
2812
30
    property QtObject application: null
2813
31
30
2820
32
    readonly property var lastSurface: application && application.session ?
31
    property var surface: null
2821
33
                              application.session.lastSurface : null
32
    onSurfaceChanged: {
2822
34
    onLastSurfaceChanged: {
33
        if (!active || !surface) return;
2823
35
        if (!active || !lastSurface) return;
34
        if (surface.shellChrome === Mir.LowChrome) {
2824
36
        if (lastSurface.shellChrome === Mir.LowChrome) {
35
            surface.state = Mir.FullscreenState;
2819
37
            lastSurface.state = Mir.FullscreenState;
2825
38
        }
36
        }
2826
39
    }
37
    }
2827
40
38
2828
41
    property var _connections: Connections {
39
    property var _connections: Connections {
2830
42
        target: lastSurface
40
        target: surface
2831
43
        onShellChromeChanged: {
41
        onShellChromeChanged: {
2835
44
            if (!active || !lastSurface) return;
42
            if (!active || !surface) return;
2836
45
            if (lastSurface.shellChrome === Mir.LowChrome) {
43
            if (surface.shellChrome === Mir.LowChrome) {
2837
46
                lastSurface.state = Mir.FullscreenState;
44
                surface.state = Mir.FullscreenState;
2838
47
            } else {
45
            } else {
2840
48
                lastSurface.state = Mir.RestoredState;
46
                surface.state = Mir.RestoredState;
2841
49
            }
47
            }
2842
50
        }
48
        }
2843
51
        onStateChanged: {
49
        onStateChanged: {
2844
52
            if (!active) return;
50
            if (!active) return;
2847
53
            if (lastSurface.state === Mir.RestoredState && lastSurface.shellChrome === Mir.LowChrome) {
51
            if (surface.state === Mir.RestoredState && surface.shellChrome === Mir.LowChrome) {
2848
54
                lastSurface.state = Mir.FullscreenState;
52
                surface.state = Mir.FullscreenState;
2849
55
            }
53
            }
2850
56
        }
54
        }
2851
57
    }
55
    }
2852
58
56
2853
=== renamed file 'qml/Stages/SessionContainer.qml' => 'qml/Stages/SurfaceContainer.qml'
2854
--- qml/Stages/SessionContainer.qml	2016-02-03 13:46:18 +0000
2855
+++ qml/Stages/SurfaceContainer.qml	2016-04-20 17:09:16 +0000
2856
@@ -1,5 +1,5 @@
2857
1
/*
1
/*
2859
2
 * Copyright 2014-2015 Canonical Ltd.
2
 * Copyright 2014-2016 Canonical Ltd.
2860
3
 *
3
 *
2861
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
2862
5
 * it under the terms of the GNU Lesser General Public License as published by
5
 * it under the terms of the GNU Lesser General Public License as published by
2863
@@ -15,61 +15,124 @@
2864
15
*/
15
*/
2865
16
16
2866
17
import QtQuick 2.4
17
import QtQuick 2.4
2868
18
import "Animations"
18
import Ubuntu.Components 1.3
2869
19
import Ubuntu.Gestures 0.1 // For TouchGate
2870
20
import Utils 0.1 // for InputWatcher
2871
21
import Unity.Application 0.1 // for MirSurfaceItem
2872
19
22
2873
20
FocusScope {
23
FocusScope {
2874
21
    id: root
24
    id: root
2885
22
    objectName: "sessionContainer"
25
    objectName: "surfaceContainer"
2886
23
    implicitWidth: _surfaceContainer.implicitWidth
26
2887
24
    implicitHeight: _surfaceContainer.implicitHeight
27
    // Must be set from outside
2888
25
    property QtObject session
28
    property var surface: null
2889
26
    readonly property var childSessions: session ? session.childSessions : null
29
2890
27
    readonly property alias surface: _surfaceContainer.surface
30
    // Might be changed from outside
2881
28
    property alias interactive: _surfaceContainer.interactive
2882
29
    property alias surfaceOrientationAngle: _surfaceContainer.surfaceOrientationAngle
2883
30
    property alias resizeSurface: _surfaceContainer.resizeSurface
2884
31
2891
32
    property int requestedWidth: -1
31
    property int requestedWidth: -1
2892
33
    property int requestedHeight: -1
32
    property int requestedHeight: -1
2905
34
33
    property bool interactive
2906
35
    readonly property alias surfaceContainer: _surfaceContainer
34
    property int surfaceOrientationAngle: 0
2907
36
    SurfaceContainer {
35
    property bool resizeSurface: true
2908
37
        id: _surfaceContainer
36
    property bool inPromptSession: false
2909
38
        requestedWidth: root.requestedWidth
37
2910
39
        requestedHeight: root.requestedHeight
38
    onSurfaceChanged: {
2911
40
        surface: session ? session.lastSurface : null
39
        // Not a binding because animations might remove the surface from the surfaceItem
2912
41
    }
40
        // programatically (in order to signal that a zombie surface is free for deletion),
2913
42
41
        // even though root.surface is still !null.
2914
43
    // SurfaceContainer size drives SessionContainer size
42
        surfaceItem.surface = surface;
2915
44
    Binding {
43
    }
2916
45
        target: root; property: "width"; value: _surfaceContainer.width
44
2917
45
    InputWatcher {
2918
46
        target: surfaceItem
2919
47
        onTargetPressedChanged: {
2920
48
            if (targetPressed && root.interactive) {
2921
49
                root.focus = true;
2922
50
                root.forceActiveFocus();
2923
51
            }
2924
52
        }
2925
53
    }
2926
54
2927
55
    MirSurfaceItem {
2928
56
        id: surfaceItem
2929
57
        objectName: "surfaceItem"
2930
58
2931
59
        fillMode: MirSurfaceItem.PadOrCrop
2932
60
        consumesInput: true
2933
61
2934
62
        surfaceWidth: {
2935
63
            if (root.resizeSurface) {
2936
64
                if (root.requestedWidth >= 0) {
2937
65
                    return root.requestedWidth;
2938
66
                } else {
2939
67
                    return width;
2940
68
                }
2941
69
            } else {
2942
70
                return -1;
2943
71
            }
2944
72
        }
2945
73
2946
74
        surfaceHeight: {
2947
75
            if (root.resizeSurface) {
2948
76
                if (root.requestedHeight >= 0) {
2949
77
                    return root.requestedHeight;
2950
78
                } else {
2951
79
                    return height;
2952
80
                }
2953
81
            } else {
2954
82
                return -1;
2955
83
            }
2956
84
        }
2957
85
2958
86
        enabled: root.interactive
2959
87
        antialiasing: !root.interactive
2960
88
        orientationAngle: root.surfaceOrientationAngle
2961
89
    }
2962
90
2963
91
    TouchGate {
2964
92
        targetItem: surfaceItem
2965
93
        anchors.fill: root
2966
94
        enabled: surfaceItem.enabled
2967
95
    }
2968
96
2969
97
    // MirSurface size drives SurfaceContainer size
2970
98
    Binding {
2971
99
        target: surfaceItem; property: "width"; value: root.surface ? root.surface.size.width : 0
2972
100
        when: root.requestedWidth >= 0 && root.surface
2973
101
    }
2974
102
    Binding {
2975
103
        target: surfaceItem; property: "height"; value: root.surface ? root.surface.size.height : 0
2976
104
        when: root.requestedHeight >= 0 && root.surface
2977
105
    }
2978
106
    Binding {
2979
107
        target: root; property: "width"; value: surfaceItem.width
2980
46
        when: root.requestedWidth >= 0
108
        when: root.requestedWidth >= 0
2981
47
    }
109
    }
2982
48
    Binding {
110
    Binding {
2984
49
        target: root; property: "height"; value: _surfaceContainer.height
111
        target: root; property: "height"; value: surfaceItem.height
2985
50
        when: root.requestedHeight >= 0
112
        when: root.requestedHeight >= 0
2986
51
    }
113
    }
2987
52
114
2989
53
    // SessionContainer size drives SurfaceContainer size
115
    // SurfaceContainer size drives MirSurface size
2990
54
    Binding {
116
    Binding {
2992
55
        target: _surfaceContainer; property: "width"; value: root.width
117
        target: surfaceItem; property: "width"; value: root.width
2993
56
        when: root.requestedWidth < 0
118
        when: root.requestedWidth < 0
2994
57
    }
119
    }
2995
58
    Binding {
120
    Binding {
2997
59
        target: _surfaceContainer; property: "height"; value: root.height
121
        target: surfaceItem; property: "height"; value: root.height
2998
60
        when: root.requestedHeight < 0
122
        when: root.requestedHeight < 0
2999
61
    }
123
    }
3000
62
124
3001
63
    Repeater {
125
    Repeater {
3004
64
        id: childSessionsRepeater
126
        id: childSurfacesRepeater
3005
65
        model: root.childSessions
127
        objectName: "childSurfacesRepeater"
3006
128
        model: root.surface ? root.surface.promptSurfaceList : null
3007
66
129
3008
67
        delegate: Loader {
130
        delegate: Loader {
3009
68
            objectName: "childDelegate" + index
131
            objectName: "childDelegate" + index
3011
69
            anchors.fill: surfaceContainer
132
            anchors.fill: root
3012
70
133
3013
71
            // Only way to do recursive qml items.
134
            // Only way to do recursive qml items.
3015
72
            source: Qt.resolvedUrl("SessionContainer.qml")
135
            source: Qt.resolvedUrl("SurfaceContainer.qml")
3016
73
136
3017
74
            z: index
137
            z: index
3018
75
138
3019
@@ -81,12 +144,12 @@
3020
81
144
3021
82
            Binding {
145
            Binding {
3022
83
                target: item; when: item
146
                target: item; when: item
3024
84
                property: "interactive"; value: index == (childSessionsRepeater.count - 1) && root.interactive
147
                property: "interactive"; value: index == (childSurfacesRepeater.count - 1) && root.interactive
3025
85
            }
148
            }
3026
86
149
3027
87
            Binding {
150
            Binding {
3028
88
                target: item; when: item
151
                target: item; when: item
3030
89
                property: "session"; value: modelData
152
                property: "surface"; value: model.surface
3031
90
            }
153
            }
3032
91
154
3033
92
            Binding {
155
            Binding {
3034
@@ -98,79 +161,47 @@
3035
98
                target: item; when: item
161
                target: item; when: item
3036
99
                property: "height"; value: root.height
162
                property: "height"; value: root.height
3037
100
            }
163
            }
3100
101
        }
164
3101
102
    }
165
            Binding {
3102
103
166
                target: item; when: item
3103
104
    states: [
167
                property: "inPromptSession"; value: true
3104
105
        State {
168
            }
3105
106
            name: "rootSession"
169
        }
3106
107
            when: root.session && !root.session.parentSession
170
    }
3107
108
        },
171
3108
109
172
    Loader {
3109
110
        State {
173
        id: animationsLoader
3110
111
            name: "childSession"
174
        objectName: "animationsLoader"
3111
112
            when: root.session && root.session.parentSession !== null && root.session.live
175
        active: root.surface
3112
113
                    && !root.session.lastSurface
176
        source: {
3113
114
        },
177
            if (root.inPromptSession) {
3114
115
178
                return "PromptSurfaceAnimations.qml";
3115
116
        State {
179
            } else {
3116
117
            name: "childSessionReady"
180
                // Let ApplicationWindow do the animations
3117
118
            when: root.session && root.session.parentSession !== null && root.session.live
181
                return "";
3118
119
                    && root.session.lastSurface !== null
182
            }
3119
120
        },
183
        }
3120
121
184
        Binding {
3121
122
        State {
185
            target: animationsLoader.item
3122
123
            name: "childSessionZombie"
186
            when: animationsLoader.item
3123
124
            when: root.session && root.session.parentSession !== null && !root.session.live
187
            property: "surfaceItem"
3124
125
        }
188
            value: surfaceItem
3125
126
    ]
189
        }
3126
127
190
        Binding {
3127
128
    transitions: [
191
            target: animationsLoader.item
3128
129
        Transition {
192
            when: animationsLoader.item
3129
130
            to: "childSessionReady"
193
            property: "container"
3130
131
            ScriptAction { script: { if (!surfaceContainer.hadSurface) { animateIn(swipeFromBottom); } } }
194
            value: root
3131
132
        },
195
        }
3070
133
        Transition {
3071
134
            to: "childSessionZombie"
3072
135
            ScriptAction { script: { animateOut(); } }
3073
136
        }
3074
137
    ]
3075
138
3076
139
    function animateIn(component) {
3077
140
        var animation = component.createObject(root, { "container": root, });
3078
141
        animation.start();
3079
142
3080
143
        var tmp = d.animations;
3081
144
        tmp.push(animation);
3082
145
        d.animations = tmp;
3083
146
    }
3084
147
3085
148
    function animateOut() {
3086
149
        if (d.animations.length > 0) {
3087
150
            var tmp = d.animations;
3088
151
            var popped = tmp.pop();
3089
152
            popped.completed.connect(function() { root.session.release(); } );
3090
153
            popped.end();
3091
154
            d.animations = tmp;
3092
155
        } else {
3093
156
            root.session.release();
3094
157
        }
3095
158
    }
3096
159
3097
160
    Component {
3098
161
        id: swipeFromBottom
3099
162
        SwipeFromBottomAnimation {}
3132
163
    }
196
    }
3133
164
197
3134
165
    QtObject {
198
    QtObject {
3135
166
        id: d
199
        id: d
3136
167
        property var animations: []
3137
168
3138
169
        property var focusedChild: {
200
        property var focusedChild: {
3141
170
            if (childSessionsRepeater.count == 0) {
201
            if (childSurfacesRepeater.count == 0) {
3142
171
                return _surfaceContainer;
202
                return surfaceItem;
3143
172
            } else {
203
            } else {
3145
173
                return childSessionsRepeater.itemAt(childSessionsRepeater.count - 1);
204
                return childSurfacesRepeater.itemAt(childSurfacesRepeater.count - 1);
3146
174
            }
205
            }
3147
175
        }
206
        }
3148
176
        onFocusedChildChanged: {
207
        onFocusedChildChanged: {
3149
177
208
3150
=== removed file 'qml/Stages/SurfaceContainer.qml'
3151
--- qml/Stages/SurfaceContainer.qml	2016-04-20 17:09:15 +0000
3152
+++ qml/Stages/SurfaceContainer.qml	1970-01-01 00:00:00 +0000
3153
@@ -1,154 +0,0 @@
3154
1
/*
3155
2
 * Copyright 2014-2015 Canonical Ltd.
3156
3
 *
3157
4
 * This program is free software; you can redistribute it and/or modify
3158
5
 * it under the terms of the GNU Lesser General Public License as published by
3159
6
 * the Free Software Foundation; version 3.
3160
7
 *
3161
8
 * This program is distributed in the hope that it will be useful,
3162
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3163
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3164
11
 * GNU Lesser General Public License for more details.
3165
12
 *
3166
13
 * You should have received a copy of the GNU Lesser General Public License
3167
14
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3168
15
*/
3169
16
3170
17
import QtQuick 2.4
3171
18
import Ubuntu.Components 1.3
3172
19
import Ubuntu.Gestures 0.1 // For TouchGate
3173
20
import Utils 0.1 // for InputWatcher
3174
21
import Unity.Application 0.1 // for MirSurfaceItem
3175
22
3176
23
FocusScope {
3177
24
    id: root
3178
25
    objectName: "surfaceContainer"
3179
26
3180
27
    property var surface: null
3181
28
    property bool hadSurface: false
3182
29
    property bool interactive
3183
30
    property int surfaceOrientationAngle: 0
3184
31
    property string name: surface ? surface.name : ""
3185
32
    property bool resizeSurface: true
3186
33
3187
34
    property int requestedWidth: -1
3188
35
    property int requestedHeight: -1
3189
36
3190
37
    onSurfaceChanged: {
3191
38
        if (surface) {
3192
39
            surfaceItem.surface = surface;
3193
40
            root.hadSurface = false;
3194
41
        }
3195
42
    }
3196
43
3197
44
    InputWatcher {
3198
45
        target: surfaceItem
3199
46
        onTargetPressedChanged: {
3200
47
            if (targetPressed && root.interactive) {
3201
48
                root.focus = true;
3202
49
                root.forceActiveFocus();
3203
50
            }
3204
51
        }
3205
52
    }
3206
53
3207
54
    MirSurfaceItem {
3208
55
        id: surfaceItem
3209
56
        objectName: "surfaceItem"
3210
57
3211
58
        fillMode: MirSurfaceItem.PadOrCrop
3212
59
        consumesInput: true
3213
60
3214
61
        surfaceWidth: {
3215
62
            if (root.resizeSurface) {
3216
63
                if (root.requestedWidth >= 0) {
3217
64
                    return root.requestedWidth;
3218
65
                } else {
3219
66
                    return width;
3220
67
                }
3221
68
            } else {
3222
69
                return -1;
3223
70
            }
3224
71
        }
3225
72
3226
73
        surfaceHeight: {
3227
74
            if (root.resizeSurface) {
3228
75
                if (root.requestedHeight >= 0) {
3229
76
                    return root.requestedHeight;
3230
77
                } else {
3231
78
                    return height;
3232
79
                }
3233
80
            } else {
3234
81
                return -1;
3235
82
            }
3236
83
        }
3237
84
3238
85
        enabled: root.interactive
3239
86
        focus: true
3240
87
        antialiasing: !root.interactive
3241
88
        orientationAngle: root.surfaceOrientationAngle
3242
89
    }
3243
90
3244
91
    // MirSurface size drives SurfaceContainer size
3245
92
    Binding {
3246
93
        target: surfaceItem; property: "width"; value: root.surface ? root.surface.size.width : 0
3247
94
        when: root.requestedWidth >= 0 && root.surface
3248
95
    }
3249
96
    Binding {
3250
97
        target: surfaceItem; property: "height"; value: root.surface ? root.surface.size.height : 0
3251
98
        when: root.requestedHeight >= 0 && root.surface
3252
99
    }
3253
100
    Binding {
3254
101
        target: root; property: "width"; value: surfaceItem.width
3255
102
        when: root.requestedWidth >= 0
3256
103
    }
3257
104
    Binding {
3258
105
        target: root; property: "height"; value: surfaceItem.height
3259
106
        when: root.requestedHeight >= 0
3260
107
    }
3261
108
3262
109
    // SurfaceContainer size drives MirSurface size
3263
110
    Binding {
3264
111
        target: surfaceItem; property: "width"; value: root.width
3265
112
        when: root.requestedWidth < 0
3266
113
    }
3267
114
    Binding {
3268
115
        target: surfaceItem; property: "height"; value: root.height
3269
116
        when: root.requestedHeight < 0
3270
117
    }
3271
118
3272
119
3273
120
    TouchGate {
3274
121
        objectName: "touchGate-"+name
3275
122
        targetItem: surfaceItem
3276
123
        anchors.fill: root
3277
124
        enabled: surfaceItem.enabled
3278
125
    }
3279
126
3280
127
    states: [
3281
128
        State {
3282
129
            name: "zombie"
3283
130
            when: surfaceItem.surface && !surfaceItem.live
3284
131
        }
3285
132
    ]
3286
133
    transitions: [
3287
134
        Transition {
3288
135
            from: ""; to: "zombie"
3289
136
            SequentialAnimation {
3290
137
                UbuntuNumberAnimation { target: surfaceItem; property: "opacity"; to: 0.0
3291
138
                                        duration: UbuntuAnimation.BriskDuration }
3292
139
                PropertyAction { target: surfaceItem; property: "visible"; value: false }
3293
140
                ScriptAction { script: {
3294
141
                    surfaceItem.surface = null;
3295
142
                    root.hadSurface = true;
3296
143
                } }
3297
144
            }
3298
145
        },
3299
146
        Transition {
3300
147
            from: "zombie"; to: ""
3301
148
            ScriptAction { script: {
3302
149
                surfaceItem.opacity = 1.0;
3303
150
                surfaceItem.visible = true;
3304
151
            } }
3305
152
        }
3306
153
    ]
3307
154
}
3308
155
0
3309
=== modified file 'qml/Stages/TabletStage.qml'
3310
--- qml/Stages/TabletStage.qml	2016-04-20 17:09:15 +0000
3311
+++ qml/Stages/TabletStage.qml	2016-04-20 17:09:16 +0000
3312
@@ -27,19 +27,24 @@
3313
27
    objectName: "stages"
27
    objectName: "stages"
3314
28
    anchors.fill: parent
28
    anchors.fill: parent
3315
29
29
3316
30
    // <tutorial-hacks> The Tutorial looks into our implementation details
3317
30
    property alias sideStageVisible: spreadView.sideStageVisible
31
    property alias sideStageVisible: spreadView.sideStageVisible
3318
31
    property alias sideStageWidth: spreadView.sideStageWidth
32
    property alias sideStageWidth: spreadView.sideStageWidth
3319
33
    // The stage the currently focused surface is in
3320
34
    property int stageFocusedSurface: priv.focusedAppDelegate ? priv.focusedAppDelegate.stage : ApplicationInfoInterface.MainStage
3321
35
    // </tutorial-hacks>
3322
32
36
3323
33
    // Functions to be called from outside
37
    // Functions to be called from outside
3324
34
    function updateFocusedAppOrientation() {
38
    function updateFocusedAppOrientation() {
3328
35
        var mainStageAppIndex = priv.indexOf(priv.mainStageAppId);
39
        var mainStageIndex = root.topLevelSurfaceList.indexForId(priv.mainStageItemId);
3329
36
        if (mainStageAppIndex >= 0 && mainStageAppIndex < spreadRepeater.count) {
40
3330
37
            spreadRepeater.itemAt(mainStageAppIndex).matchShellOrientation();
41
        if (priv.mainStageItemId && mainStageIndex >= 0 && mainStageIndex < spreadRepeater.count) {
3331
42
            spreadRepeater.itemAt(mainStageIndex).matchShellOrientation();
3332
38
        }
43
        }
3333
39
44
3334
40
        for (var i = 0; i < spreadRepeater.count; ++i) {
45
        for (var i = 0; i < spreadRepeater.count; ++i) {
3335
41
46
3337
42
            if (i === mainStageAppIndex) {
47
            if (i === mainStageIndex) {
3338
43
                continue;
48
                continue;
3339
44
            }
49
            }
3340
45
50
3341
@@ -60,16 +65,14 @@
3342
60
        }
65
        }
3343
61
    }
66
    }
3344
62
    function updateFocusedAppOrientationAnimated() {
67
    function updateFocusedAppOrientationAnimated() {
3348
63
        var mainStageAppIndex = priv.indexOf(priv.mainStageAppId);
68
        var mainStageIndex = root.topLevelSurfaceList.indexForId(priv.mainStageItemId);
3349
64
        if (mainStageAppIndex >= 0 && mainStageAppIndex < spreadRepeater.count) {
69
        if (priv.mainStageItemId && mainStageIndex >= 0 && mainStageIndex < spreadRepeater.count) {
3350
65
            spreadRepeater.itemAt(mainStageAppIndex).animateToShellOrientation();
70
            spreadRepeater.itemAt(mainStageIndex).animateToShellOrientation();
3351
66
        }
71
        }
3352
67
72
3358
68
        if (priv.sideStageAppId) {
73
        var sideStageIndex = root.topLevelSurfaceList.indexForId(priv.sideStageItemId);
3359
69
            var sideStageAppIndex = priv.indexOf(priv.sideStageAppId);
74
        if (sideStageIndex >= 0 && sideStageIndex < spreadRepeater.count) {
3360
70
            if (sideStageAppIndex >= 0 && sideStageAppIndex < spreadRepeater.count) {
75
            spreadRepeater.itemAt(sideStageIndex).matchShellOrientation();
3356
71
                spreadRepeater.itemAt(sideStageAppIndex).matchShellOrientation();
3357
72
            }
3361
73
        }
76
        }
3362
74
    }
77
    }
3363
75
78
3364
@@ -81,11 +84,20 @@
3365
81
84
3366
82
    orientationChangesEnabled: priv.mainAppOrientationChangesEnabled
85
    orientationChangesEnabled: priv.mainAppOrientationChangesEnabled
3367
83
86
3368
87
    mainApp: {
3369
88
        if (priv.mainStageItemId > 0) {
3370
89
            var index = root.topLevelSurfaceList.indexForId(priv.mainStageItemId);
3371
90
            return root.topLevelSurfaceList.applicationAt(index);
3372
91
        } else {
3373
92
            return null;
3374
93
        }
3375
94
    }
3376
95
3377
84
    supportedOrientations: {
96
    supportedOrientations: {
3378
85
        if (mainApp) {
97
        if (mainApp) {
3379
86
            var orientations = mainApp.supportedOrientations;
98
            var orientations = mainApp.supportedOrientations;
3380
87
            orientations |= Qt.LandscapeOrientation | Qt.InvertedLandscapeOrientation;
99
            orientations |= Qt.LandscapeOrientation | Qt.InvertedLandscapeOrientation;
3382
88
            if (priv.sideStageAppId && !spreadView.surfaceDragging) {
100
            if (priv.sideStageItemId && !spreadView.surfaceDragging) {
3383
89
                // If we have a sidestage app, support Portrait orientation
101
                // If we have a sidestage app, support Portrait orientation
3384
90
                // so that it will switch the sidestage app to mainstage on rotate
102
                // so that it will switch the sidestage app to mainstage on rotate
3385
91
                orientations |= Qt.PortraitOrientation|Qt.InvertedPortraitOrientation;
103
                orientations |= Qt.PortraitOrientation|Qt.InvertedPortraitOrientation;
3386
@@ -116,7 +128,7 @@
3387
116
        if (inverseProgress == 0 && priv.oldInverseProgress > 0) {
128
        if (inverseProgress == 0 && priv.oldInverseProgress > 0) {
3388
117
            // left edge drag released. Minimum distance is given by design.
129
            // left edge drag released. Minimum distance is given by design.
3389
118
            if (priv.oldInverseProgress > units.gu(22)) {
130
            if (priv.oldInverseProgress > units.gu(22)) {
3391
119
                ApplicationManager.requestFocusApplication("unity8-dash");
131
                root.applicationManager.requestFocusApplication("unity8-dash");
3392
120
            }
132
            }
3393
121
        }
133
        }
3394
122
        priv.oldInverseProgress = inverseProgress;
134
        priv.oldInverseProgress = inverseProgress;
3395
@@ -154,17 +166,51 @@
3396
154
        }
166
        }
3397
155
    }
167
    }
3398
156
168
3399
169
    Connections {
3400
170
        target: root.topLevelSurfaceList
3401
171
        onListChanged: priv.updateMainAndSideStageIndexes()
3402
172
    }
3403
173
3404
157
    QtObject {
174
    QtObject {
3405
158
        id: priv
175
        id: priv
3406
159
        objectName: "stagesPriv"
176
        objectName: "stagesPriv"
3407
160
177
3412
161
        property string focusedAppId: ApplicationManager.focusedApplicationId
178
        function updateMainAndSideStageIndexes() {
3413
162
        readonly property var focusedAppDelegate: {
179
            var choseMainStage = false;
3414
163
            var index = indexOf(focusedAppId);
180
            var choseSideStage = false;
3415
164
            return index >= 0 && index < spreadRepeater.count ? spreadRepeater.itemAt(index) : null
181
3416
182
            if (!root.topLevelSurfaceList)
3417
183
                return;
3418
184
3419
185
            for (var i = 0; i < spreadRepeater.count && (!choseMainStage || !choseSideStage); ++i) {
3420
186
                var spreadDelegate = spreadRepeater.itemAt(i);
3421
187
                if (sideStage.shown && spreadDelegate.stage == ApplicationInfoInterface.SideStage
3422
188
                        && !choseSideStage) {
3423
189
                    priv.sideStageDelegate = spreadDelegate
3424
190
                    priv.sideStageItemId = root.topLevelSurfaceList.idAt(i);
3425
191
                    priv.sideStageAppId = root.topLevelSurfaceList.applicationAt(i).appId;
3426
192
                    choseSideStage = true;
3427
193
                } else if (!choseMainStage && spreadDelegate.stage == ApplicationInfoInterface.MainStage) {
3428
194
                    priv.mainStageDelegate = spreadDelegate;
3429
195
                    priv.mainStageItemId = root.topLevelSurfaceList.idAt(i);
3430
196
                    priv.mainStageAppId = root.topLevelSurfaceList.applicationAt(i).appId;
3431
197
                    choseMainStage = true;
3432
198
                }
3433
199
            }
3434
200
            if (!choseMainStage) {
3435
201
                priv.mainStageDelegate = null;
3436
202
                priv.mainStageItemId = 0;
3437
203
                priv.mainStageAppId = "";
3438
204
            }
3439
205
            if (!choseSideStage) {
3440
206
                priv.sideStageDelegate = null;
3441
207
                priv.sideStageItemId = 0;
3442
208
                priv.sideStageAppId = "";
3443
209
            }
3444
165
        }
210
        }
3445
166
211
3447
167
        property string oldFocusedAppId: ""
212
        property var focusedAppDelegate: null
3448
213
3449
168
        property bool mainAppOrientationChangesEnabled: false
214
        property bool mainAppOrientationChangesEnabled: false
3450
169
215
3451
170
        property real landscapeHeight: root.orientations.native_ == Qt.LandscapeOrientation ?
216
        property real landscapeHeight: root.orientations.native_ == Qt.LandscapeOrientation ?
3452
@@ -173,36 +219,21 @@
3453
173
        property bool shellIsLandscape: root.shellOrientation === Qt.LandscapeOrientation
219
        property bool shellIsLandscape: root.shellOrientation === Qt.LandscapeOrientation
3454
174
                      || root.shellOrientation === Qt.InvertedLandscapeOrientation
220
                      || root.shellOrientation === Qt.InvertedLandscapeOrientation
3455
175
221
3462
176
        property string mainStageAppId
222
        property var mainStageDelegate: null
3463
177
        property string sideStageAppId
223
        property var sideStageDelegate: null
3464
178
224
3465
179
        // For convenience, keep properties of the first two apps in the model
225
        property int mainStageItemId: 0
3466
180
        property string appId0
226
        property int sideStageItemId: 0
3467
181
        property string appId1
227
3468
228
        property string mainStageAppId: ""
3469
229
        property string sideStageAppId: ""
3470
182
230
3471
183
        property int oldInverseProgress: 0
231
        property int oldInverseProgress: 0
3472
184
232
3473
185
        property int highlightIndex: 0
233
        property int highlightIndex: 0
3474
186
234
3475
187
        onFocusedAppIdChanged: updateStageApps()
3476
188
3477
189
        onFocusedAppDelegateChanged: {
3478
190
            if (focusedAppDelegate) {
3479
191
                focusedAppDelegate.focus = true;
3480
192
            }
3481
193
        }
3482
194
3483
195
        property bool focusedAppDelegateIsDislocated: focusedAppDelegate &&
235
        property bool focusedAppDelegateIsDislocated: focusedAppDelegate &&
3484
196
                                                      (focusedAppDelegate.dragOffset !== 0 || focusedAppDelegate.xTranslateAnimating)
236
                                                      (focusedAppDelegate.dragOffset !== 0 || focusedAppDelegate.xTranslateAnimating)
3485
197
        function indexOf(appId) {
3486
198
            for (var i = 0; i < ApplicationManager.count; i++) {
3487
199
                if (ApplicationManager.get(i).appId == appId) {
3488
200
                    return i;
3489
201
                }
3490
202
            }
3491
203
            return -1;
3492
204
        }
3493
205
3494
206
        function evaluateOneWayFlick(gesturePoints) {
237
        function evaluateOneWayFlick(gesturePoints) {
3495
207
            // Need to have at least 3 points to recognize it as a flick
238
            // Need to have at least 3 points to recognize it as a flick
3496
208
            if (gesturePoints.length < 3) {
239
            if (gesturePoints.length < 3) {
3497
@@ -231,88 +262,45 @@
3498
231
            spreadView.contentX = highlightIndex * spreadView.contentWidth / (spreadRepeater.count + 2)
262
            spreadView.contentX = highlightIndex * spreadView.contentWidth / (spreadRepeater.count + 2)
3499
232
        }
263
        }
3500
233
264
3501
234
        function getTopApp(stage) {
3502
235
            for (var i = 0; i < ApplicationManager.count; i++) {
3503
236
                var app = ApplicationManager.get(i)
3504
237
                if (app.stage === stage) {
3505
238
                    return app;
3506
239
                }
3507
240
            }
3508
241
            return null;
3509
242
        }
3510
243
3511
244
        function setAppStage(appId, stage, save) {
3512
245
            var app = ApplicationManager.findApplication(appId);
3513
246
            if (app) {
3514
247
                app.stage = stage;
3515
248
                if (save) {
3516
249
                    WindowStateStorage.saveStage(appId, stage);
3517
250
                }
3518
251
            }
3519
252
        }
3520
253
3521
254
        function updateStageApps() {
3522
255
            var app = priv.getTopApp(ApplicationInfoInterface.MainStage);
3523
256
            priv.mainStageAppId = app ? app.appId : ""
3524
257
            root.mainApp = app;
3525
258
3526
259
            if (sideStage.shown) {
3527
260
                app = priv.getTopApp(ApplicationInfoInterface.SideStage);
3528
261
                priv.sideStageAppId = app ? app.appId : ""
3529
262
            } else {
3530
263
                priv.sideStageAppId = "";
3531
264
            }
3532
265
3533
266
            appId0 = ApplicationManager.count >= 1 ? ApplicationManager.get(0).appId : "";
3534
267
            appId1 = ApplicationManager.count > 1 ? ApplicationManager.get(1).appId : "";
3535
268
        }
3536
269
3537
270
        readonly property bool sideStageEnabled: root.shellOrientation == Qt.LandscapeOrientation ||
265
        readonly property bool sideStageEnabled: root.shellOrientation == Qt.LandscapeOrientation ||
3538
271
                                                 root.shellOrientation == Qt.InvertedLandscapeOrientation
266
                                                 root.shellOrientation == Qt.InvertedLandscapeOrientation
3583
272
        Component.onCompleted: updateStageApps();
267
    }
3584
273
    }
268
3585
274
269
    Instantiator {
3586
275
    Connections {
270
        model: root.applicationManager
3587
276
        target: ApplicationManager
271
        delegate: QtObject {
3588
277
        onFocusRequested: {
272
            property var stateBinding: Binding {
3589
278
            if (spreadView.interactive) {
273
                readonly property bool isDash: model.application ? model.application.appId == "unity8-dash" : false
3590
279
                spreadView.snapTo(priv.indexOf(appId));
274
                target: model.application
3591
280
            } else {
275
                property: "requestedState"
3592
281
                ApplicationManager.focusApplication(appId);
276
3593
282
            }
277
                // NB: the first application clause is just to ensure we never get warnings for trying to access
3594
283
        }
278
                //     members of a null variable.
3595
284
279
                value: model.application &&
3596
285
        onApplicationAdded: {
280
                        (
3597
286
            if (spreadView.phase == 2) {
281
                          (isDash && root.keepDashRunning)
3598
287
                spreadView.snapTo(ApplicationManager.count - 1);
282
                           || (!root.suspended && (model.application.appId === priv.mainStageAppId
3599
288
            } else {
283
                                                   || model.application.appId === priv.sideStageAppId))
3600
289
                spreadView.phase = 0;
284
                        )
3601
290
                spreadView.contentX = -spreadView.shift;
285
                       ? ApplicationInfoInterface.RequestedRunning
3602
291
                ApplicationManager.focusApplication(appId);
286
                       : ApplicationInfoInterface.RequestedSuspended
3603
292
            }
287
            }
3604
293
        }
288
3605
294
289
            property var lifecycleBinding: Binding {
3606
295
        onApplicationRemoved: {
290
                target: model.application
3607
296
            if (priv.mainStageAppId == appId) {
291
                property: "exemptFromLifecycle"
3608
297
                ApplicationManager.focusApplication("unity8-dash")
292
                value: model.application
3609
298
            }
293
                            ? (!model.application.isTouchApp || isExemptFromLifecycle(model.application.appId))
3610
299
            if (priv.sideStageAppId == appId) {
294
                            : false
3611
300
                var app = priv.getTopApp(ApplicationInfoInterface.SideStage);
295
            }
3612
301
                priv.sideStageAppId = app === null ? "" : app.appId;
296
        }
3613
302
            }
297
    }
3614
303
298
3615
304
            if (ApplicationManager.count == 0) {
299
    Binding {
3616
305
                spreadView.phase = 0;
300
        target: MirFocusController
3617
306
                spreadView.contentX = -spreadView.shift;
301
        property: "focusedSurface"
3618
307
            } else if (spreadView.closingIndex == -1) {
302
        value: priv.focusedAppDelegate ? priv.focusedAppDelegate.surface : null
3619
308
                // Unless we're closing the app ourselves in the spread,
303
        when: root.parent && !spreadRepeater.startingUp
3576
309
                // lets make sure the spread doesn't mess up by the changing app list.
3577
310
                spreadView.phase = 0;
3578
311
                spreadView.contentX = -spreadView.shift;
3579
312
3580
313
                ApplicationManager.focusApplication(ApplicationManager.get(0).appId);
3581
314
            }
3582
315
        }
3620
316
    }
304
    }
3621
317
305
3622
318
    Flickable {
306
    Flickable {
3623
@@ -363,16 +351,45 @@
3624
363
        property int selectedIndex: -1
351
        property int selectedIndex: -1
3625
364
        property int draggedDelegateCount: 0
352
        property int draggedDelegateCount: 0
3626
365
        property int closingIndex: -1
353
        property int closingIndex: -1
3628
366
        property var selectedApplication: selectedIndex !== -1 ? ApplicationManager.get(selectedIndex) : null
354
        property var selectedDelegate: selectedIndex !== -1 ? spreadRepeater.itemAt(selectedIndex) : null
3629
367
355
3632
368
        // FIXME: Workaround Flickable's not keepping its contentX still when resized
356
        // <FIXME-contentX> Workaround Flickable's behavior of bringing contentX back between valid boundaries
3633
369
        onContentXChanged: { forceItToRemainStillIfBeingResized(); }
357
        // when resized. The proper way to fix this is refactoring PhoneStage so that it doesn't
3634
358
        // rely on having Flickable.contentX keeping an out-of-bounds value when it's set programatically
3635
359
        // (as opposed to having contentX reaching an out-of-bounds value through dragging, which will trigger
3636
360
        // the Flickable.boundsBehavior upon release).
3637
361
        onContentXChanged: {
3638
362
            if (!undoContentXReset()) {
3639
363
                forceItToRemainStillIfBeingResized();
3640
364
            }
3641
365
        }
3642
370
        onShiftChanged: { forceItToRemainStillIfBeingResized(); }
366
        onShiftChanged: { forceItToRemainStillIfBeingResized(); }
3643
371
        function forceItToRemainStillIfBeingResized() {
367
        function forceItToRemainStillIfBeingResized() {
3645
372
            if (root.beingResized && contentX != -shift) {
368
            if (root.beingResized && contentX != -spreadView.shift) {
3646
369
                contentX = -spreadView.shift;
3647
370
            }
3648
371
        }
3649
372
        function undoContentXReset() {
3650
373
            if (contentWidth <= 0) {
3651
374
                contentWidthOnLastContentXChange = contentWidth;
3652
375
                lastContentX = contentX;
3653
376
                return false;
3654
377
            }
3655
378
3656
379
            if (contentWidth != contentWidthOnLastContentXChange
3657
380
                    && lastContentX == -shift && contentX == 0) {
3658
381
                // Flickable is resetting contentX because contentWidth has changed. Undo it.
3659
373
                contentX = -shift;
382
                contentX = -shift;
3660
383
                return true;
3661
374
            }
384
            }
3662
385
3663
386
            contentWidthOnLastContentXChange = contentWidth;
3664
387
            lastContentX = contentX;
3665
388
            return false;
3666
375
        }
389
        }
3667
390
        property real contentWidthOnLastContentXChange: -1
3668
391
        property real lastContentX: 0
3669
392
        // </FIXME-contentX>
3670
376
393
3671
377
        property bool animateX: true
394
        property bool animateX: true
3672
378
        property bool beingResized: root.beingResized
395
        property bool beingResized: root.beingResized
3673
@@ -385,31 +402,33 @@
3674
385
            }
402
            }
3675
386
        }
403
        }
3676
387
404
3677
388
        property real sideStageDragProgress: sideStage.progress
3678
389
        property bool sideStageVisible: priv.sideStageAppId
3679
390
        property real sideStageWidth: units.gu(40)
405
        property real sideStageWidth: units.gu(40)
3680
391
406
3681
392
        property bool surfaceDragging: triGestureArea.recognisedDrag
407
        property bool surfaceDragging: triGestureArea.recognisedDrag
3682
393
408
3684
394
        // In case the ApplicationManager already holds an app when starting up we're missing animations
409
        readonly property bool sideStageVisible: priv.sideStageItemId != 0
3685
410
3686
411
        // In case applicationManager already holds an app when starting up we're missing animations
3687
395
        // Make sure we end up in the same state
412
        // Make sure we end up in the same state
3688
396
        Component.onCompleted: {
413
        Component.onCompleted: {
3689
397
            spreadView.contentX = -spreadView.shift
414
            spreadView.contentX = -spreadView.shift
3690
398
        }
415
        }
3691
399
416
3692
400
        property int nextInStack: {
417
        property int nextInStack: {
3693
418
            var mainStageIndex = priv.mainStageDelegate ? priv.mainStageDelegate.index : -1;
3694
419
            var sideStageIndex = priv.sideStageDelegate ? priv.sideStageDelegate.index : -1;
3695
401
            switch (state) {
420
            switch (state) {
3696
402
            case "main":
421
            case "main":
3698
403
                if (ApplicationManager.count > 1) {
422
                if (root.topLevelSurfaceList.count > 1) {
3699
404
                    return 1;
423
                    return 1;
3700
405
                }
424
                }
3701
406
                return -1;
425
                return -1;
3702
407
            case "mainAndOverlay":
426
            case "mainAndOverlay":
3704
408
                if (ApplicationManager.count <= 2) {
427
                if (root.topLevelSurfaceList.count <= 2) {
3705
409
                    return -1;
428
                    return -1;
3706
410
                }
429
                }
3709
411
                if (priv.appId0 == priv.mainStageAppId || priv.appId0 == priv.sideStageAppId) {
430
                if (mainStageIndex == 0 || sideStageIndex == 0) {
3710
412
                    if (priv.appId1 == priv.mainStageAppId || priv.appId1 == priv.sideStageAppId) {
431
                    if (mainStageIndex == 1 || sideStageIndex == 1) {
3711
413
                        return 2;
432
                        return 2;
3712
414
                    }
433
                    }
3713
415
                    return 1;
434
                    return 1;
3714
@@ -420,7 +439,7 @@
3715
420
            }
439
            }
3716
421
            return -1;
440
            return -1;
3717
422
        }
441
        }
3719
423
        property int nextZInStack: indexToZIndex(nextInStack)
442
        property int nextZInStack
3720
424
443
3721
425
        states: [
444
        states: [
3722
426
            State {
445
            State {
3723
@@ -440,13 +459,13 @@
3724
440
            }
459
            }
3725
441
        ]
460
        ]
3726
442
        state: {
461
        state: {
3728
443
            if ((priv.mainStageAppId && !priv.sideStageAppId) || !priv.sideStageEnabled) {
462
            if ((priv.mainStageItemId && !priv.sideStageItemId) || !priv.sideStageEnabled) {
3729
444
                return "main";
463
                return "main";
3730
445
            }
464
            }
3732
446
            if (!priv.mainStageAppId && priv.sideStageAppId) {
465
            if (!priv.mainStageItemId && priv.sideStageItemId) {
3733
447
                return "overlay";
466
                return "overlay";
3734
448
            }
467
            }
3736
449
            if (priv.mainStageAppId && priv.sideStageAppId) {
468
            if (priv.mainStageItemId && priv.sideStageItemId) {
3737
450
                return "mainAndOverlay";
469
                return "mainAndOverlay";
3738
451
            }
470
            }
3739
452
            return "empty";
471
            return "empty";
3740
@@ -511,38 +530,41 @@
3741
511
            // only shuffle when we've got a main and overlay
530
            // only shuffle when we've got a main and overlay
3742
512
            if (state !== "mainAndOverlay") return index;
531
            if (state !== "mainAndOverlay") return index;
3743
513
532
3745
514
            var app = ApplicationManager.get(index);
533
            var app = root.topLevelSurfaceList.applicationAt(index);
3746
515
            if (!app) {
534
            if (!app) {
3747
516
                return index;
535
                return index;
3748
517
            }
536
            }
3749
537
            var stage = spreadRepeater.itemAt(index) ? spreadRepeater.itemAt(index).stage : app.stage;
3750
518
538
3751
519
            // don't shuffle indexes greater than "actives or next"
539
            // don't shuffle indexes greater than "actives or next"
3752
520
            if (index > 2) return index;
540
            if (index > 2) return index;
3753
521
541
3755
522
            if (app.appId === priv.mainStageAppId) {
542
            var mainStageIndex = root.topLevelSurfaceList.indexForId(priv.mainStageItemId);
3756
543
3757
544
            if (index == mainStageIndex) {
3758
523
                // Active main stage always at 0
545
                // Active main stage always at 0
3759
524
                return 0;
546
                return 0;
3760
525
            }
547
            }
3761
526
548
3762
527
            if (spreadView.nextInStack > 0) {
549
            if (spreadView.nextInStack > 0) {
3764
528
                var nextAppInStack = ApplicationManager.get(spreadView.nextInStack);
550
                var stageOfNextInStack = spreadRepeater.itemAt(spreadView.nextInStack).stage;
3765
529
551
3766
530
                if (index === spreadView.nextInStack) {
552
                if (index === spreadView.nextInStack) {
3767
531
                    // this is the next app in stack.
553
                    // this is the next app in stack.
3768
532
554
3770
533
                    if (app.stage ===  ApplicationInfoInterface.SideStage) {
555
                    if (stage ===  ApplicationInfoInterface.SideStage) {
3771
534
                        // if the next app in stack is a sidestage app, it must order on top of other side stage app
556
                        // if the next app in stack is a sidestage app, it must order on top of other side stage app
3773
535
                        return Math.min(2, ApplicationManager.count-1);
557
                        return Math.min(2, root.topLevelSurfaceList.count-1);
3774
536
                    }
558
                    }
3775
537
                    return 1;
559
                    return 1;
3776
538
                }
560
                }
3778
539
                if (nextAppInStack.stage ===  ApplicationInfoInterface.SideStage) {
561
                if (stageOfNextInStack === ApplicationInfoInterface.SideStage) {
3779
540
                    // if the next app in stack is a sidestage app, it must order on top of other side stage app
562
                    // if the next app in stack is a sidestage app, it must order on top of other side stage app
3780
541
                    return 1;
563
                    return 1;
3781
542
                }
564
                }
3783
543
                return Math.min(2, ApplicationManager.count-1);
565
                return Math.min(2, root.topLevelSurfaceList.count-1);
3784
544
            }
566
            }
3786
545
            return Math.min(index+1, ApplicationManager.count-1);
567
            return Math.min(index+1, root.topLevelSurfaceList.count-1);
3787
546
        }
568
        }
3788
547
569
3789
548
        SequentialAnimation {
570
        SequentialAnimation {
3790
@@ -560,12 +582,13 @@
3791
560
                script: {
582
                script: {
3792
561
                    if (spreadView.selectedIndex >= 0) {
583
                    if (spreadView.selectedIndex >= 0) {
3793
562
                        var newIndex = spreadView.selectedIndex;
584
                        var newIndex = spreadView.selectedIndex;
3796
563
                        var application = ApplicationManager.get(newIndex);
585
                        var application = root.topLevelSurfaceList.applicationAt(newIndex);
3797
564
                        if (application.stage === ApplicationInfoInterface.SideStage) {
586
                        var spreadDelegate = spreadRepeater.itemAt(newIndex);
3798
587
                        if (spreadDelegate.stage === ApplicationInfoInterface.SideStage) {
3799
565
                            sideStage.showNow();
588
                            sideStage.showNow();
3800
566
                        }
589
                        }
3801
567
                        spreadView.selectedIndex = -1;
590
                        spreadView.selectedIndex = -1;
3803
568
                        ApplicationManager.focusApplication(application.appId);
591
                        spreadDelegate.focus = true;
3804
569
                        spreadView.phase = 0;
592
                        spreadView.phase = 0;
3805
570
                        spreadView.contentX = -spreadView.shift;
593
                        spreadView.contentX = -spreadView.shift;
3806
571
                    }
594
                    }
3807
@@ -581,7 +604,7 @@
3808
581
        MouseArea {
604
        MouseArea {
3809
582
            id: spreadRow
605
            id: spreadRow
3810
583
            x: spreadView.contentX
606
            x: spreadView.contentX
3812
584
            width: spreadView.width + Math.max(spreadView.width, ApplicationManager.count * spreadView.tileDistance)
607
            width: spreadView.width + Math.max(spreadView.width, root.topLevelSurfaceList.count * spreadView.tileDistance)
3813
585
            height: root.height
608
            height: root.height
3814
586
609
3815
587
            onClicked: {
610
            onClicked: {
3816
@@ -599,8 +622,8 @@
3817
599
                enabled: priv.sideStageEnabled
622
                enabled: priv.sideStageEnabled
3818
600
623
3819
601
                onDropped: {
624
                onDropped: {
3822
602
                    priv.setAppStage(drag.source.appId, ApplicationInfoInterface.MainStage, true);
625
                    drop.source.spreadDelegate.stage = ApplicationInfoInterface.MainStage;
3823
603
                    ApplicationManager.focusApplication(drag.source.appId);
626
                    drop.source.spreadDelegate.focus = true;
3824
604
                }
627
                }
3825
605
                keys: "SideStage"
628
                keys: "SideStage"
3826
606
            }
629
            }
3827
@@ -611,12 +634,12 @@
3828
611
                height: priv.landscapeHeight
634
                height: priv.landscapeHeight
3829
612
                x: spreadView.width - width
635
                x: spreadView.width - width
3830
613
                z: {
636
                z: {
3837
614
                    if (!priv.mainStageAppId) return 0;
637
                    if (!priv.mainStageItemId) return 0;
3838
615
638
3839
616
                    if (priv.sideStageAppId && spreadView.nextInStack > 0) {
639
                    if (priv.sideStageItemId && spreadView.nextInStack > 0) {
3840
617
                        var nextAppInStack = ApplicationManager.get(spreadView.nextInStack);
640
                        var nextDelegateInStack = spreadRepeater.itemAt(spreadView.nextInStack);
3841
618
641
3842
619
                        if (nextAppInStack.stage ===  ApplicationInfoInterface.MainStage) {
642
                        if (nextDelegateInStack.stage ===  ApplicationInfoInterface.MainStage) {
3843
620
                            // if the next app in stack is a main stage app, put the sidestage on top of it.
643
                            // if the next app in stack is a main stage app, put the sidestage on top of it.
3844
621
                            return 2;
644
                            return 2;
3845
622
                        }
645
                        }
3846
@@ -631,12 +654,11 @@
3847
631
                Behavior on opacity { UbuntuNumberAnimation {} }
654
                Behavior on opacity { UbuntuNumberAnimation {} }
3848
632
655
3849
633
                onShownChanged: {
656
                onShownChanged: {
3856
634
                    if (!shown && ApplicationManager.focusedApplicationId == priv.sideStageAppId) {
657
                    if (!shown && priv.sideStageDelegate && priv.focusedAppDelegate === priv.sideStageDelegate
3857
635
                        ApplicationManager.requestFocusApplication(priv.mainStageAppId);
658
                            && priv.mainStageDelegate) {
3858
636
                    }
659
                        priv.mainStageDelegate.focus = true;
3859
637
                    priv.updateStageApps();
660
                    } else if (shown && priv.sideStageDelegate) {
3860
638
                    if (shown && priv.sideStageAppId) {
661
                        priv.sideStageDelegate.focus = true;
3855
639
                        ApplicationManager.requestFocusApplication(priv.sideStageAppId);
3861
640
                    }
662
                    }
3862
641
                }
663
                }
3863
642
664
3864
@@ -655,8 +677,8 @@
3865
655
                    }
677
                    }
3866
656
                    onDropped: {
678
                    onDropped: {
3867
657
                        if (drop.keys == "MainStage") {
679
                        if (drop.keys == "MainStage") {
3870
658
                            priv.setAppStage(drop.source.appId, ApplicationInfoInterface.SideStage, true);
680
                            drop.source.spreadDelegate.stage = ApplicationInfoInterface.SideStage;
3871
659
                            ApplicationManager.requestFocusApplication(drop.source.appId);
681
                            drop.source.spreadDelegate.focus = true;
3872
660
                        }
682
                        }
3873
661
                    }
683
                    }
3874
662
                    drag {
684
                    drag {
3875
@@ -669,41 +691,102 @@
3876
669
                }
691
                }
3877
670
            }
692
            }
3878
671
693
3880
672
            Repeater {
694
            TopLevelSurfaceRepeater {
3881
673
                id: spreadRepeater
695
                id: spreadRepeater
3882
674
                objectName: "spreadRepeater"
696
                objectName: "spreadRepeater"
3884
675
                model: ApplicationManager
697
                model: root.topLevelSurfaceList
3885
698
3886
699
                onItemAdded: {
3887
700
                    priv.updateMainAndSideStageIndexes();
3888
701
                    if (spreadView.phase == 2) {
3889
702
                        spreadView.snapTo(index);
3890
703
                    }
3891
704
                }
3892
705
3893
706
                onItemRemoved: {
3894
707
                    priv.updateMainAndSideStageIndexes();
3895
708
                    // Unless we're closing the app ourselves in the spread,
3896
709
                    // lets make sure the spread doesn't mess up by the changing app list.
3897
710
                    if (spreadView.closingIndex == -1) {
3898
711
                        spreadView.phase = 0;
3899
712
                        spreadView.contentX = -spreadView.shift;
3900
713
                        focusTopMostApp();
3901
714
                    }
3902
715
                }
3903
716
                function focusTopMostApp() {
3904
717
                    if (spreadRepeater.count > 0) {
3905
718
                        var topmostDelegate = spreadRepeater.itemAt(0);
3906
719
                        topmostDelegate.focus = true;
3907
720
                    }
3908
721
                }
3909
676
722
3910
677
                delegate: TransformedTabletSpreadDelegate {
723
                delegate: TransformedTabletSpreadDelegate {
3911
678
                    id: spreadTile
724
                    id: spreadTile
3914
679
                    objectName: model.appId ? "tabletSpreadDelegate_" + model.appId
725
                    objectName: "spreadDelegate_" + model.id
3915
680
                                            : "tabletSpreadDelegate_null";
726
3916
727
                    readonly property int index: model.index
3917
681
                    width: spreadView.width
728
                    width: spreadView.width
3918
682
                    height: spreadView.height
729
                    height: spreadView.height
3920
683
                    active: appId == priv.mainStageAppId || appId == priv.sideStageAppId
730
                    active: model.id == priv.mainStageItemId || model.id == priv.sideStageItemId
3921
684
                    zIndex: selected && stage == ApplicationInfoInterface.MainStage ? 0 : spreadView.indexToZIndex(index)
731
                    zIndex: selected && stage == ApplicationInfoInterface.MainStage ? 0 : spreadView.indexToZIndex(index)
3922
732
                    onZIndexChanged: {
3923
733
                        if (spreadView.nextInStack == model.index) {
3924
734
                            spreadView.nextZInStack = zIndex;
3925
735
                        }
3926
736
                    }
3927
685
                    selected: spreadView.selectedIndex == index
737
                    selected: spreadView.selectedIndex == index
3928
686
                    otherSelected: spreadView.selectedIndex >= 0 && !selected
738
                    otherSelected: spreadView.selectedIndex >= 0 && !selected
3930
687
                    isInSideStage: priv.sideStageAppId === appId
739
                    isInSideStage: priv.sideStageItemId == model.id
3931
688
                    interactive: !spreadView.interactive && spreadView.phase === 0 && root.interactive
740
                    interactive: !spreadView.interactive && spreadView.phase === 0 && root.interactive
3932
689
                    swipeToCloseEnabled: spreadView.interactive && !snapAnimation.running
741
                    swipeToCloseEnabled: spreadView.interactive && !snapAnimation.running
3933
690
                    maximizedAppTopMargin: root.maximizedAppTopMargin
742
                    maximizedAppTopMargin: root.maximizedAppTopMargin
3936
691
                    dragOffset: !isDash && appId == priv.mainStageAppId && root.inverseProgress > 0 && spreadView.phase === 0 ? root.inverseProgress : 0
743
                    dragOffset: !isDash && model.id == priv.mainStageItemId && root.inverseProgress > 0
3937
692
                    application: ApplicationManager.get(index)
744
                            && spreadView.phase === 0 ? root.inverseProgress : 0
3938
745
                    application: model.application
3939
746
                    surface: model.surface
3940
693
                    closeable: !isDash
747
                    closeable: !isDash
3941
694
                    highlightShown: root.altTabPressed && priv.highlightIndex == zIndex
748
                    highlightShown: root.altTabPressed && priv.highlightIndex == zIndex
3942
695
749
3949
696
                    readonly property bool wantsMainStage: model.stage == ApplicationInfoInterface.MainStage
750
                    readonly property bool wantsMainStage: stage == ApplicationInfoInterface.MainStage
3950
697
751
3951
698
                    readonly property string appId: model.appId
752
                    readonly property bool isDash: model.application.appId == "unity8-dash"
3952
699
                    readonly property bool isDash: model.appId == "unity8-dash"
753
3953
700
754
                    onFocusChanged: {
3954
701
                    stage: model.stage
755
                        if (focus && !spreadRepeater.startingUp) {
3955
756
                            priv.focusedAppDelegate = spreadTile;
3956
757
                            root.topLevelSurfaceList.raiseId(model.id);
3957
758
                        }
3958
759
                        if (focus && priv.sideStageEnabled && stage === ApplicationInfoInterface.SideStage) {
3959
760
                            sideStage.show();
3960
761
                        }
3961
762
                    }
3962
763
                    Connections {
3963
764
                        target: model.surface
3964
765
                        onFocusRequested: spreadTile.focus = true;
3965
766
                    }
3966
767
                    Connections {
3967
768
                        target: model.application
3968
769
                        onFocusRequested: {
3969
770
                            if (!model.surface) {
3970
771
                                // when an app has no surfaces, we assume there's only one entry representing it:
3971
772
                                // this delegate.
3972
773
                                spreadTile.focus = true;
3973
774
                            } else {
3974
775
                                // if the application has surfaces, focus request should be at surface-level.
3975
776
                            }
3976
777
                        }
3977
778
                    }
3978
779
3979
702
                    fullscreen: {
780
                    fullscreen: {
3982
703
                        if (mainApp && stage === ApplicationInfoInterface.SideStage) {
781
                        if (priv.mainStageDelegate && stage === ApplicationInfoInterface.SideStage) {
3983
704
                            return mainApp.fullscreen;
782
                            return priv.mainStageDelegate.fullscreen;
3984
783
                        } else if (surface) {
3985
784
                            return surface.state === Mir.FullscreenState;
3986
785
                        } else if (application) {
3987
786
                            return application.fullscreen;
3988
787
                        } else {
3989
788
                            return false;
3990
705
                        }
789
                        }
3991
706
                        return application ? application.fullscreen : false;
3992
707
                    }
790
                    }
3993
708
791
3994
709
                    supportedOrientations: {
792
                    supportedOrientations: {
3995
@@ -724,23 +807,6 @@
3996
724
                        }
807
                        }
3997
725
                    }
808
                    }
3998
726
809
3999
727
4000
728
                    Binding {
4001
729
                        target: spreadTile.application
4002
730
                        property: "exemptFromLifecycle"
4003
731
                        value: !model.isTouchApp || isExemptFromLifecycle(model.appId)
4004
732
                    }
4005
733
4006
734
                    Binding {
4007
735
                        target: spreadTile.application
4008
736
                        property: "requestedState"
4009
737
                        value: (isDash && root.keepDashRunning)
4010
738
                                   || (!root.suspended && (model.appId == priv.mainStageAppId
4011
739
                                                           || model.appId == priv.sideStageAppId))
4012
740
                               ? ApplicationInfoInterface.RequestedRunning
4013
741
                               : ApplicationInfoInterface.RequestedSuspended
4014
742
                    }
4015
743
4016
744
                    // FIXME: A regular binding doesn't update any more after closing an app.
810
                    // FIXME: A regular binding doesn't update any more after closing an app.
4017
745
                    // Using a Binding for now.
811
                    // Using a Binding for now.
4018
746
                    Binding {
812
                    Binding {
4019
@@ -760,34 +826,33 @@
4020
760
                        onSideStageEnabledChanged: refreshStage()
826
                        onSideStageEnabledChanged: refreshStage()
4021
761
                    }
827
                    }
4022
762
828
4023
829
                    property bool _constructing: true;
4024
830
                    onStageChanged: {
4025
831
                        if (!_constructing) {
4026
832
                            priv.updateMainAndSideStageIndexes();
4027
833
                        }
4028
834
                    }
4029
835
4030
763
                    Component.onCompleted: {
836
                    Component.onCompleted: {
4033
764
                        refreshStage()
837
                        // a top level window is always the focused one when it first appears, unfocusing
4034
765
                        stageChanged.connect(priv.updateStageApps);
838
                        // any preexisting one
4035
839
                        focus = true;
4036
840
                        refreshStage();
4037
841
                        _constructing = false;
4038
842
                    }
4039
843
                    Component.onDestruction: {
4040
844
                        WindowStateStorage.saveStage(model.application.appId, stage);
4041
766
                    }
845
                    }
4042
767
846
4043
768
                    function refreshStage() {
847
                    function refreshStage() {
4045
769
                        var stage = ApplicationInfoInterface.MainStage;
848
                        var newStage = ApplicationInfoInterface.MainStage;
4046
770
                        if (priv.sideStageEnabled) {
849
                        if (priv.sideStageEnabled) {
4047
771
                            if (application && application.supportedOrientations & (Qt.PortraitOrientation|Qt.InvertedPortraitOrientation)) {
850
                            if (application && application.supportedOrientations & (Qt.PortraitOrientation|Qt.InvertedPortraitOrientation)) {
4049
772
                                stage = WindowStateStorage.getStage(appId);
851
                                newStage = WindowStateStorage.getStage(application.appId);
4050
773
                            }
852
                            }
4051
774
                        }
853
                        }
4052
775
854
4068
776
                        if (model.stage !== stage) {
855
                        stage = newStage;
4054
777
                            priv.setAppStage(appId, stage, false);
4055
778
                        }
4056
779
                    }
4057
780
4058
781
                    // This is required because none of the bindings are triggered in some cases:
4059
782
                    // When an app is closed, it might happen that ApplicationManager.get(nextInStack)
4060
783
                    // returns a different app even though the nextInStackIndex and all the related
4061
784
                    // bindings (index, mainStageApp, sideStageApp, etc) don't change. Let's force a
4062
785
                    // binding update in that case.
4063
786
                    Connections {
4064
787
                        target: ApplicationManager
4065
788
                        onApplicationRemoved: spreadTile.z = Qt.binding(function() {
4066
789
                            return spreadView.indexToZIndex(index);
4067
790
                        })
4069
791
                    }
856
                    }
4070
792
857
4071
793
                    progress: {
858
                    progress: {
4072
@@ -873,13 +938,10 @@
4073
873
                                    script: {
938
                                    script: {
4074
874
                                        // rotate immediately.
939
                                        // rotate immediately.
4075
875
                                        spreadTile.matchShellOrientation();
940
                                        spreadTile.matchShellOrientation();
4077
876
                                        if (ApplicationManager.focusedApplicationId === spreadTile.appId &&
941
                                        if (priv.focusedAppDelegate === spreadTile &&
4078
877
                                                priv.sideStageEnabled && !sideStage.shown) {
942
                                                priv.sideStageEnabled && !sideStage.shown) {
4079
878
                                            // Sidestage was focused, so show the side stage.
943
                                            // Sidestage was focused, so show the side stage.
4080
879
                                            sideStage.show();
944
                                            sideStage.show();
4081
880
                                        // if we've switched to a main app which doesnt support portrait, hide the side stage.
4082
881
                                        } else if (mainApp && (mainApp.supportedOrientations & (Qt.PortraitOrientation|Qt.InvertedPortraitOrientation)) == 0) {
4083
882
                                            sideStage.hideNow();
4084
883
                                        }
945
                                        }
4085
884
                                    }
946
                                    }
4086
885
                                }
947
                                }
4087
@@ -890,10 +952,10 @@
4088
890
                            SequentialAnimation {
952
                            SequentialAnimation {
4089
891
                                ScriptAction {
953
                                ScriptAction {
4090
892
                                    script: {
954
                                    script: {
4092
893
                                        if (priv.sideStageAppId === spreadTile.appId &&
955
                                        if (priv.sideStageDelegate === spreadTile &&
4093
894
                                                mainApp && (mainApp.supportedOrientations & (Qt.PortraitOrientation|Qt.InvertedPortraitOrientation)) == 0) {
956
                                                mainApp && (mainApp.supportedOrientations & (Qt.PortraitOrientation|Qt.InvertedPortraitOrientation)) == 0) {
4094
895
                                            // The mainstage app did not natively support portrait orientation, so focus the sidestage.
957
                                            // The mainstage app did not natively support portrait orientation, so focus the sidestage.
4096
896
                                            ApplicationManager.requestFocusApplication(spreadTile.appId);
958
                                            spreadTile.focus = true;
4097
897
                                        }
959
                                        }
4098
898
                                    }
960
                                    }
4099
899
                                }
961
                                }
4100
@@ -922,28 +984,26 @@
4101
922
984
4102
923
                    onClosed: {
985
                    onClosed: {
4103
924
                        spreadView.closingIndex = index;
986
                        spreadView.closingIndex = index;
4114
925
                        ApplicationManager.stopApplication(ApplicationManager.get(index).appId);
987
                        if (spreadTile.surface) {
4115
926
                    }
988
                            spreadTile.surface.close();
4116
927
989
                        } else if (spreadTile.application) {
4117
928
                    onFocusChanged: {
990
                            root.applicationManager.stopApplication(spreadTile.application.appId);
4118
929
                        if (focus && ApplicationManager.focusedApplicationId !== appId) {
991
                        } else {
4119
930
                            ApplicationManager.focusApplication(appId);
992
                            // should never happen
4120
931
                        }
993
                            console.warn("Can't close topLevelSurfaceList entry as it has neither"
4121
932
994
                                         + " a surface nor an application");
4112
933
                        if (focus && priv.sideStageEnabled && stage === ApplicationInfoInterface.SideStage) {
4113
934
                            sideStage.show();
4122
935
                        }
995
                        }
4123
936
                    }
996
                    }
4124
937
997
4125
938
                    Binding {
998
                    Binding {
4126
939
                        target: root
999
                        target: root
4128
940
                        when: model.appId == priv.mainStageAppId
1000
                        when: model.id == priv.mainStageItemId
4129
941
                        property: "mainAppWindowOrientationAngle"
1001
                        property: "mainAppWindowOrientationAngle"
4130
942
                        value: appWindowOrientationAngle
1002
                        value: appWindowOrientationAngle
4131
943
                    }
1003
                    }
4132
944
                    Binding {
1004
                    Binding {
4133
945
                        target: priv
1005
                        target: priv
4135
946
                        when: model.appId == priv.mainStageAppId
1006
                        when: model.id == priv.mainStageItemId
4136
947
                        property: "mainAppOrientationChangesEnabled"
1007
                        property: "mainAppOrientationChangesEnabled"
4137
948
                        value: orientationChangesEnabled
1008
                        value: orientationChangesEnabled
4138
949
                    }
1009
                    }
4139
@@ -957,7 +1017,7 @@
4140
957
1017
4141
958
                    StagedFullscreenPolicy {
1018
                    StagedFullscreenPolicy {
4142
959
                        id: fullscreenPolicy
1019
                        id: fullscreenPolicy
4144
960
                        application: spreadTile.application
1020
                        surface: model.surface
4145
961
                    }
1021
                    }
4146
962
                    Connections {
1022
                    Connections {
4147
963
                        target: root
1023
                        target: root
4148
@@ -973,17 +1033,19 @@
4149
973
        anchors.fill: parent
1033
        anchors.fill: parent
4150
974
        enabled: priv.sideStageEnabled && !spreadView.active
1034
        enabled: priv.sideStageEnabled && !spreadView.active
4151
975
        property var dragObject: null
1035
        property var dragObject: null
4153
976
        property string appId: ""
1036
4154
1037
        property Item spreadDelegate
4155
1038
4156
977
        dragComponent: dragComponent
1039
        dragComponent: dragComponent
4158
978
        dragComponentProperties: { "appId": appId }
1040
        dragComponentProperties: { "spreadDelegate": spreadDelegate }
4159
979
1041
4160
980
        onPressed: {
1042
        onPressed: {
4162
981
            function matchDelegate(obj) { return String(obj.objectName).indexOf("tabletSpreadDelegate") >= 0; }
1043
            function matchDelegate(obj) { return String(obj.objectName).indexOf("spreadDelegate") >= 0; }
4163
982
1044
4164
983
            var delegateAtCenter = Functions.itemAt(spreadRow, x, y, matchDelegate);
1045
            var delegateAtCenter = Functions.itemAt(spreadRow, x, y, matchDelegate);
4165
984
            if (!delegateAtCenter) return;
1046
            if (!delegateAtCenter) return;
4166
985
1047
4168
986
            appId = delegateAtCenter.appId;
1048
            spreadDelegate = delegateAtCenter;
4169
987
        }
1049
        }
4170
988
1050
4171
989
        onClicked: {
1051
        onClicked: {
4172
@@ -1003,11 +1065,11 @@
4173
1003
1065
4174
1004
        Component {
1066
        Component {
4175
1005
            id: dragComponent
1067
            id: dragComponent
4181
1006
            SessionContainer {
1068
            SurfaceContainer {
4182
1007
                property string appId: ""
1069
                property Item spreadDelegate
4183
1008
                property var application: ApplicationManager.findApplication(appId)
1070
4184
1009
1071
                surface: spreadDelegate ? spreadDelegate.surface : null
4185
1010
                session: application ? application.session : null
1072
4186
1011
                interactive: false
1073
                interactive: false
4187
1012
                resizeSurface: false
1074
                resizeSurface: false
4188
1013
                focus: false
1075
                focus: false
4189
@@ -1019,10 +1081,11 @@
4190
1019
                Drag.hotSpot.y: height/2
1081
                Drag.hotSpot.y: height/2
4191
1020
                // only accept opposite stage.
1082
                // only accept opposite stage.
4192
1021
                Drag.keys: {
1083
                Drag.keys: {
4194
1022
                    if (!application) return "Disabled";
1084
                    if (!surface) return "Disabled";
4195
1023
1085
4198
1024
                    if (application.stage === ApplicationInfo.MainStage) {
1086
                    if (spreadDelegate.stage === ApplicationInfo.MainStage) {
4199
1025
                        if (application.supportedOrientations & (Qt.PortraitOrientation|Qt.InvertedPortraitOrientation)) {
1087
                        if (spreadDelegate.application.supportedOrientations
4200
1088
                                & (Qt.PortraitOrientation|Qt.InvertedPortraitOrientation)) {
4201
1026
                            return "MainStage";
1089
                            return "MainStage";
4202
1027
                        }
1090
                        }
4203
1028
                        return "Disabled";
1091
                        return "Disabled";
4204
1029
1092
4205
=== added file 'qml/Stages/TopLevelSurfaceRepeater.qml'
4206
--- qml/Stages/TopLevelSurfaceRepeater.qml	1970-01-01 00:00:00 +0000
4207
+++ qml/Stages/TopLevelSurfaceRepeater.qml	2016-04-20 17:09:16 +0000
4208
@@ -0,0 +1,52 @@
4209
1
/*
4210
2
 * Copyright (C) 2016 Canonical, Ltd.
4211
3
 *
4212
4
 * This program is free software; you can redistribute it and/or modify
4213
5
 * it under the terms of the GNU General Public License as published by
4214
6
 * the Free Software Foundation; version 3.
4215
7
 *
4216
8
 * This program is distributed in the hope that it will be useful,
4217
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4218
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4219
11
 * GNU General Public License for more details.
4220
12
 *
4221
13
 * You should have received a copy of the GNU General Public License
4222
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4223
15
 */
4224
16
4225
17
import QtQuick 2.4
4226
18
4227
19
Repeater {
4228
20
    id: root
4229
21
    // FIXME: This is a hack around us not knowing whether the Repeater has finished creating its
4230
22
    // delegates on start up.
4231
23
    // This is a problem when the stage gets a TopLevelSurfaceList already populated with several
4232
24
    // rows.
4233
25
    property bool startingUp: true
4234
26
    onStartingUpChanged: {
4235
27
        if (!startingUp) {
4236
28
            // the top-most surface must be the focused one.
4237
29
            var topmostDelegate = itemAt(0);
4238
30
            topmostDelegate.focus = true;
4239
31
        }
4240
32
    }
4241
33
4242
34
    onItemAdded: {
4243
35
        if (startingUp) {
4244
36
            checkIfStillStartingUp();
4245
37
        }
4246
38
    }
4247
39
4248
40
    function checkIfStillStartingUp() {
4249
41
        var i = 0;
4250
42
        var missingDelegate = false;
4251
43
        for (i = 0; i < model.count && !missingDelegate; ++i) {
4252
44
            if (!itemAt(i)) {
4253
45
                missingDelegate = true;
4254
46
            }
4255
47
        }
4256
48
        if (!missingDelegate) {
4257
49
            startingUp = false;
4258
50
        }
4259
51
    }
4260
52
}
4261
0
53
4262
=== modified file 'qml/Stages/TransformedSpreadDelegate.qml'
4263
--- qml/Stages/TransformedSpreadDelegate.qml	2015-07-15 15:07:19 +0000
4264
+++ qml/Stages/TransformedSpreadDelegate.qml	2016-04-20 17:09:16 +0000
4265
@@ -1,5 +1,5 @@
4266
1
/*
1
/*
4268
2
 * Copyright 2014 Canonical Ltd.
2
 * Copyright 2014,2016 Canonical Ltd.
4269
3
 *
3
 *
4270
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
4271
5
 * it under the terms of the GNU Lesser General Public License as published by
5
 * it under the terms of the GNU Lesser General Public License as published by
4272
@@ -312,7 +312,7 @@
4273
312
        // non-fullscreen window when they're stacked on top of each other on the
312
        // non-fullscreen window when they're stacked on top of each other on the
4274
313
        // far left of the spread.
313
        // far left of the spread.
4275
314
        Translate {
314
        Translate {
4277
315
            y: !fullscreen && appWindowRotation === 180
315
            y: !root.fullscreen && appWindowRotation === 180
4278
316
                   ? priv.topMarginProgress * maximizedAppTopMargin
316
                   ? priv.topMarginProgress * maximizedAppTopMargin
4279
317
                   : 0
317
                   : 0
4280
318
        },
318
        },
4281
@@ -326,7 +326,7 @@
4282
326
                switch (appWindowRotation) {
326
                switch (appWindowRotation) {
4283
327
                case 90:
327
                case 90:
4284
328
                case 270:
328
                case 270:
4286
329
                    if (fullscreen) {
329
                    if (root.fullscreen) {
4287
330
                        return 1;
330
                        return 1;
4288
331
                    } else {
331
                    } else {
4289
332
                        return 1 + priv.topMarginProgress * maximizedAppTopMargin / spreadView.width;
332
                        return 1 + priv.topMarginProgress * maximizedAppTopMargin / spreadView.width;
4290
@@ -340,7 +340,7 @@
4291
340
            yScale: {
340
            yScale: {
4292
341
                switch (appWindowRotation) {
341
                switch (appWindowRotation) {
4293
342
                case 0:
342
                case 0:
4295
343
                    if (fullscreen) {
343
                    if (root.fullscreen) {
4296
344
                        return 1 - priv.topMarginProgress * maximizedAppTopMargin / spreadView.height;
344
                        return 1 - priv.topMarginProgress * maximizedAppTopMargin / spreadView.height;
4297
345
                    } else {
345
                    } else {
4298
346
                        return 1;
346
                        return 1;
4299
347
347
4300
=== modified file 'qml/Stages/TransformedTabletSpreadDelegate.qml'
4301
--- qml/Stages/TransformedTabletSpreadDelegate.qml	2016-03-11 20:18:12 +0000
4302
+++ qml/Stages/TransformedTabletSpreadDelegate.qml	2016-04-20 17:09:16 +0000
4303
@@ -31,7 +31,6 @@
4304
31
    // Set this to true when this tile a currently active on either the MS or the SS.
31
    // Set this to true when this tile a currently active on either the MS or the SS.
4305
32
    property bool active: false
32
    property bool active: false
4306
33
33
4307
34
    property int stage
4308
35
    property int zIndex
34
    property int zIndex
4309
36
    property real progress: 0
35
    property real progress: 0
4310
37
    property real animatedProgress: 0
36
    property real animatedProgress: 0
4311
@@ -48,13 +47,15 @@
4312
48
47
4313
49
    property bool isInSideStage: false
48
    property bool isInSideStage: false
4314
50
49
4315
50
    property int stage: ApplicationInfoInterface.MainStage
4316
51
4317
51
    property int dragOffset: 0
52
    property int dragOffset: 0
4318
52
    readonly property alias xTranslateAnimating: xTranslateAnimation.running
53
    readonly property alias xTranslateAnimating: xTranslateAnimation.running
4319
53
    readonly property bool offScreen: priv.xTranslate >= 0
54
    readonly property bool offScreen: priv.xTranslate >= 0
4320
54
55
4321
55
    dropShadow: spreadView.active ||
56
    dropShadow: spreadView.active ||
4322
56
                (active
57
                (active
4324
57
                 && (stage == ApplicationInfoInterface.MainStage || !priv.shellIsLandscape)
58
                 && (root.stage == ApplicationInfoInterface.MainStage || !priv.shellIsLandscape)
4325
58
                 && priv.xTranslate != 0)
59
                 && priv.xTranslate != 0)
4326
59
60
4327
60
    onSelectedChanged: {
61
    onSelectedChanged: {
4328
@@ -90,7 +91,7 @@
4329
90
        id: priv
91
        id: priv
4330
91
92
4331
92
        // true if this is the next tile on the stack that comes in when dragging from the right
93
        // true if this is the next tile on the stack that comes in when dragging from the right
4333
93
        property bool nextInStack: spreadView.nextZInStack == zIndex
94
        property bool nextInStack: spreadView.nextInStack == model.index
4334
94
        // true if the next tile in the stack is the nextInStack one. This one will be moved a bit to the left
95
        // true if the next tile in the stack is the nextInStack one. This one will be moved a bit to the left
4335
95
        property bool movedActive: spreadView.nextZInStack == zIndex + 1
96
        property bool movedActive: spreadView.nextZInStack == zIndex + 1
4336
96
        property real animatedEndDistance: linearAnimation(0, 2, root.endDistance, 0, root.progress)
97
        property real animatedEndDistance: linearAnimation(0, 2, root.endDistance, 0, root.progress)
4337
@@ -142,7 +143,7 @@
4338
142
        Behavior on xTranslate {
143
        Behavior on xTranslate {
4339
143
            enabled: !spreadView.active &&
144
            enabled: !spreadView.active &&
4340
144
                     !snapAnimation.running &&
145
                     !snapAnimation.running &&
4342
145
                     model.appId !== "unity8-dash" &&
146
                     root.application.appId !== "unity8-dash" &&
4343
146
                     spreadView.animateX &&
147
                     spreadView.animateX &&
4344
147
                     !spreadView.beingResized &&
148
                     !spreadView.beingResized &&
4345
148
                     priv.state !== "sideStage"
149
                     priv.state !== "sideStage"
4346
@@ -156,8 +157,9 @@
4347
156
            var newTranslate = 0;
157
            var newTranslate = 0;
4348
157
158
4349
158
            // selected app or opposite stage active app.
159
            // selected app or opposite stage active app.
4352
159
            if (isSelected || (otherSelected && root.active && spreadView.selectedApplication && spreadView.selectedApplication.stage !== stage)) {
160
            if (isSelected || (otherSelected && root.active && spreadView.selectedDelegate
4353
160
                if (stage == ApplicationInfoInterface.MainStage) {
161
                        && spreadView.selectedDelegate.stage !== root.stage)) {
4354
162
                if (root.stage == ApplicationInfoInterface.MainStage) {
4355
161
                    return linearAnimation(selectedProgress, negativeProgress, selectedXTranslate, -spreadView.width, root.progress);
163
                    return linearAnimation(selectedProgress, negativeProgress, selectedXTranslate, -spreadView.width, root.progress);
4356
162
                } else {
164
                } else {
4357
163
                    return linearAnimation(selectedProgress, negativeProgress, selectedXTranslate, -spreadView.sideStageWidth, root.progress);
165
                    return linearAnimation(selectedProgress, negativeProgress, selectedXTranslate, -spreadView.sideStageWidth, root.progress);
4358
@@ -168,8 +170,8 @@
4359
168
170
4360
169
            // The tile should move a bit to the left if a new one comes on top of it, but not for the Side Stage and not
171
            // The tile should move a bit to the left if a new one comes on top of it, but not for the Side Stage and not
4361
170
            // when we're only dragging the side stage in on top of a main stage app
172
            // when we're only dragging the side stage in on top of a main stage app
4364
171
            var shouldMoveAway = spreadView.nextInStack >= 0 && priv.movedActive && stage === ApplicationInfoInterface.MainStage &&
173
            var shouldMoveAway = spreadView.nextInStack >= 0 && priv.movedActive && root.stage === ApplicationInfoInterface.MainStage &&
4365
172
                    ApplicationManager.get(spreadView.nextInStack).stage === ApplicationInfoInterface.MainStage;
174
                    topLevelSurfaceList.applicationAt(spreadView.nextInStack).stage === ApplicationInfoInterface.MainStage;
4366
173
175
4367
174
            if (active) {
176
            if (active) {
4368
175
                newTranslate -= root.width
177
                newTranslate -= root.width
4369
@@ -178,7 +180,7 @@
4370
178
                    newTranslate += linearAnimation(0, spreadView.positionMarker2, 0, -units.gu(4), root.animatedProgress);
180
                    newTranslate += linearAnimation(0, spreadView.positionMarker2, 0, -units.gu(4), root.animatedProgress);
4371
179
                }
181
                }
4372
180
                newTranslate += root.dragOffset;
182
                newTranslate += root.dragOffset;
4374
181
            } else if (!spreadView.active && model.appId == "unity8-dash") {
183
            } else if (!spreadView.active && root.application.appId == "unity8-dash") {
4375
182
                newTranslate -= root.width;
184
                newTranslate -= root.width;
4376
183
            }
185
            }
4377
184
186
4378
@@ -190,14 +192,14 @@
4379
190
192
4380
191
            if (spreadView.phase == 0) {
193
            if (spreadView.phase == 0) {
4381
192
                if (nextInStack) {
194
                if (nextInStack) {
4383
193
                    if (stage == ApplicationInfoInterface.MainStage) {
195
                    if (root.stage == ApplicationInfoInterface.MainStage) {
4384
194
                        if (spreadView.sideStageVisible && root.progress > 0) {
196
                        if (spreadView.sideStageVisible && root.progress > 0) {
4385
195
                            // Move it so it appears from behind the side stage immediately
197
                            // Move it so it appears from behind the side stage immediately
4386
196
                            newTranslate += -spreadView.sideStageWidth;
198
                            newTranslate += -spreadView.sideStageWidth;
4387
197
                        }
199
                        }
4388
198
                    }
200
                    }
4389
199
201
4391
200
                    if (stage == ApplicationInfoInterface.SideStage && !spreadView.sideStageVisible) {
202
                    if (root.stage == ApplicationInfoInterface.SideStage && !spreadView.sideStageVisible) {
4392
201
                        // This is when we only drag the side stage in, without rotation or snapping
203
                        // This is when we only drag the side stage in, without rotation or snapping
4393
202
                        newTranslate = linearAnimation(0, spreadView.positionMarker2, 0, -spreadView.sideStageWidth, root.animatedProgress);
204
                        newTranslate = linearAnimation(0, spreadView.positionMarker2, 0, -spreadView.sideStageWidth, root.animatedProgress);
4394
203
                    } else {
205
                    } else {
4395
@@ -210,7 +212,7 @@
4396
210
212
4397
211
            if (spreadView.phase == 1) {
213
            if (spreadView.phase == 1) {
4398
212
                if (nextInStack) {
214
                if (nextInStack) {
4400
213
                    if (stage == ApplicationInfoInterface.MainStage) {
215
                    if (root.stage == ApplicationInfoInterface.MainStage) {
4401
214
                        var startValue = -spreadView.sideStageWidth * spreadView.snapPosition + (spreadView.sideStageVisible ? -spreadView.sideStageWidth : 0);
216
                        var startValue = -spreadView.sideStageWidth * spreadView.snapPosition + (spreadView.sideStageVisible ? -spreadView.sideStageWidth : 0);
4402
215
                        newTranslate += linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, startValue, priv.phase2StartTranslate, root.animatedProgress);
217
                        newTranslate += linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, startValue, priv.phase2StartTranslate, root.animatedProgress);
4403
216
                    } else {
218
                    } else {
4404
@@ -250,7 +252,8 @@
4405
250
            }
252
            }
4406
251
253
4407
252
            // selected app or opposite stage active app.
254
            // selected app or opposite stage active app.
4409
253
            if (isSelected || (otherSelected && root.active && spreadView.selectedApplication && spreadView.selectedApplication.stage !== stage)) {
255
            if (isSelected || (otherSelected && root.active && spreadView.selectedDelegate
4410
256
                        && spreadView.selectedDelegate.stage !== root.stage)) {
4411
254
                return linearAnimation(selectedProgress, negativeProgress, selectedScale, 1, root.progress);
257
                return linearAnimation(selectedProgress, negativeProgress, selectedScale, 1, root.progress);
4412
255
            } else if (otherSelected) {
258
            } else if (otherSelected) {
4413
256
                return selectedScale;
259
                return selectedScale;
4414
@@ -258,7 +261,7 @@
4415
258
261
4416
259
            if (spreadView.phase == 0) {
262
            if (spreadView.phase == 0) {
4417
260
                if (nextInStack) {
263
                if (nextInStack) {
4419
261
                    if (stage == ApplicationInfoInterface.SideStage && !spreadView.sideStageVisible) {
264
                    if (root.stage == ApplicationInfoInterface.SideStage && !spreadView.sideStageVisible) {
4420
262
                        return 1;
265
                        return 1;
4421
263
                    } else {
266
                    } else {
4422
264
                        var targetScale = root.dragStartScale - ((root.dragStartScale - 1) * spreadView.snapPosition);
267
                        var targetScale = root.dragStartScale - ((root.dragStartScale - 1) * spreadView.snapPosition);
4423
@@ -272,7 +275,7 @@
4424
272
            if (spreadView.phase == 1) {
275
            if (spreadView.phase == 1) {
4425
273
                if (nextInStack) {
276
                if (nextInStack) {
4426
274
                    var startScale = 1;
277
                    var startScale = 1;
4428
275
                    if (stage !== ApplicationInfoInterface.SideStage || spreadView.sideStageVisible) {
278
                    if (root.stage !== ApplicationInfoInterface.SideStage || spreadView.sideStageVisible) {
4429
276
                        startScale = root.dragStartScale - ((root.dragStartScale - 1) * spreadView.snapPosition);
279
                        startScale = root.dragStartScale - ((root.dragStartScale - 1) * spreadView.snapPosition);
4430
277
                    }
280
                    }
4431
278
                    return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, startScale, priv.phase2StartScale, root.animatedProgress);
281
                    return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, startScale, priv.phase2StartScale, root.animatedProgress);
4432
@@ -295,7 +298,8 @@
4433
295
            }
298
            }
4434
296
299
4435
297
            // selected app or opposite stage active app.
300
            // selected app or opposite stage active app.
4437
298
            if (isSelected || (otherSelected && root.active && spreadView.selectedApplication && spreadView.selectedApplication.stage !== stage)) {
301
            if (isSelected || (otherSelected && root.active && spreadView.selectedDelegate
4438
302
                        && spreadView.selectedDelegate.stage !== root.stage)) {
4439
299
                return linearAnimation(selectedProgress, negativeProgress, selectedAngle, 0, root.progress);
303
                return linearAnimation(selectedProgress, negativeProgress, selectedAngle, 0, root.progress);
4440
300
            } else if (otherSelected) {
304
            } else if (otherSelected) {
4441
301
                return selectedAngle;
305
                return selectedAngle;
4442
@@ -304,12 +308,12 @@
4443
304
            // The tile should rotate a bit when another one comes on top, but not when only dragging the side stage in
308
            // The tile should rotate a bit when another one comes on top, but not when only dragging the side stage in
4444
305
            var shouldMoveAway = spreadView.nextInStack == -1 ||
309
            var shouldMoveAway = spreadView.nextInStack == -1 ||
4445
306
                    spreadView.nextInStack >= 0 && priv.movedActive &&
310
                    spreadView.nextInStack >= 0 && priv.movedActive &&
4448
307
                    (ApplicationManager.get(spreadView.nextInStack).stage === ApplicationInfoInterface.MainStage ||
311
                    (topLevelSurfaceList.applicationAt(spreadView.nextInStack).stage === ApplicationInfoInterface.MainStage ||
4449
308
                     stage == ApplicationInfoInterface.SideStage);
312
                     root.stage == ApplicationInfoInterface.SideStage);
4450
309
313
4451
310
            if (spreadView.phase == 0) {
314
            if (spreadView.phase == 0) {
4452
311
                if (nextInStack) {
315
                if (nextInStack) {
4454
312
                    if (stage == ApplicationInfoInterface.SideStage && !spreadView.sideStageVisible) {
316
                    if (root.stage == ApplicationInfoInterface.SideStage && !spreadView.sideStageVisible) {
4455
313
                        return 0;
317
                        return 0;
4456
314
                    } else {
318
                    } else {
4457
315
                        return linearAnimation(0, spreadView.positionMarker2, root.startAngle, root.startAngle * (1-spreadView.snapPosition), root.animatedProgress);
319
                        return linearAnimation(0, spreadView.positionMarker2, root.startAngle, root.startAngle * (1-spreadView.snapPosition), root.animatedProgress);
4458
@@ -321,7 +325,7 @@
4459
321
            }
325
            }
4460
322
            if (spreadView.phase == 1) {
326
            if (spreadView.phase == 1) {
4461
323
                if (nextInStack) {
327
                if (nextInStack) {
4463
324
                    if (stage == ApplicationInfoInterface.SideStage && !spreadView.sideStageVisible) {
328
                    if (root.stage == ApplicationInfoInterface.SideStage && !spreadView.sideStageVisible) {
4464
325
                        return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, 0, priv.phase2StartAngle, root.animatedProgress);
329
                        return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, 0, priv.phase2StartAngle, root.animatedProgress);
4465
326
                    } else {
330
                    } else {
4466
327
                        return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, root.startAngle * (1-spreadView.snapPosition), priv.phase2StartAngle, root.animatedProgress);
331
                        return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, root.startAngle * (1-spreadView.snapPosition), priv.phase2StartAngle, root.animatedProgress);
4467
@@ -345,7 +349,8 @@
4468
345
            if (root.isSelected) return 1;
349
            if (root.isSelected) return 1;
4469
346
350
4470
347
            if (otherSelected) {
351
            if (otherSelected) {
4472
348
                if (root.active && spreadView.selectedApplication && spreadView.selectedApplication.stage !== stage) {
352
                if (root.active && spreadView.selectedDelegate
4473
353
                        && spreadView.selectedDelegate.stage !== root.stage) {
4474
349
                    return 1;
354
                    return 1;
4475
350
                }
355
                }
4476
351
                return linearAnimation(selectedProgress, negativeProgress, selectedOpacity, 0, root.progress);
356
                return linearAnimation(selectedProgress, negativeProgress, selectedOpacity, 0, root.progress);
4477
@@ -355,7 +360,8 @@
4478
355
360
4479
356
        property real topMarginProgress: {
361
        property real topMarginProgress: {
4480
357
            // selected app or opposite stage active app.
362
            // selected app or opposite stage active app.
4482
358
            if (isSelected || (otherSelected && root.active && spreadView.selectedApplication && spreadView.selectedApplication.stage !== stage)) {
363
            if (isSelected || (otherSelected && root.active && spreadView.selectedDelegate
4483
364
                        && spreadView.selectedDelegate.stage !== root.stage)) {
4484
359
                return linearAnimation(selectedProgress, negativeProgress, selectedTopMarginProgress, 0, root.progress);
365
                return linearAnimation(selectedProgress, negativeProgress, selectedTopMarginProgress, 0, root.progress);
4485
360
            }
366
            }
4486
361
367
4487
@@ -379,7 +385,7 @@
4488
379
                when: root.isInSideStage && spreadView.shiftedContentX == 0 && spreadView.phase == 0
385
                when: root.isInSideStage && spreadView.shiftedContentX == 0 && spreadView.phase == 0
4489
380
                PropertyChanges {
386
                PropertyChanges {
4490
381
                    target: priv;
387
                    target: priv;
4492
382
                    xTranslate: -spreadView.sideStageWidth + spreadView.sideStageWidth * (1-spreadView.sideStageDragProgress)
388
                    xTranslate: -spreadView.sideStageWidth + spreadView.sideStageWidth * (1-sideStage.progress)
4493
383
                }
389
                }
4494
384
            }
390
            }
4495
385
        ]
391
        ]
4496
386
392
4497
=== modified file 'qml/Stages/WindowedFullscreenPolicy.qml'
4498
--- qml/Stages/WindowedFullscreenPolicy.qml	2016-03-15 19:38:03 +0000
4499
+++ qml/Stages/WindowedFullscreenPolicy.qml	2016-04-20 17:09:16 +0000
4500
@@ -23,19 +23,17 @@
4501
23
// state of the window is returned to restored.
23
// state of the window is returned to restored.
4502
24
QtObject {
24
QtObject {
4503
25
    property bool active: true
25
    property bool active: true
4505
26
    property QtObject application: null
26
    property QtObject surface: null
4506
27
27
4507
28
    readonly property var lastSurface: application && application.session ?
4508
29
                                      application.session.lastSurface : null
4509
30
    property bool _firstTimeSurface: true
28
    property bool _firstTimeSurface: true
4510
31
29
4513
32
    onLastSurfaceChanged: {
30
    onSurfaceChanged: {
4514
33
        if (!active || !lastSurface) return;
31
        if (!active || !surface) return;
4515
34
        if (!_firstTimeSurface) return;
32
        if (!_firstTimeSurface) return;
4516
35
        _firstTimeSurface = false;
33
        _firstTimeSurface = false;
4517
36
34
4520
37
        if (lastSurface.state === Mir.FullscreenState && lastSurface.shellChrome === Mir.LowChrome) {
35
        if (surface.state === Mir.FullscreenState && surface.shellChrome === Mir.LowChrome) {
4521
38
            lastSurface.state = Mir.RestoredState;
36
            surface.state = Mir.RestoredState;
4522
39
        }
37
        }
4523
40
    }
38
    }
4524
41
}
39
}
4525
42
40
4526
=== modified file 'qml/Tutorial/TutorialBottom.qml'
4527
--- qml/Tutorial/TutorialBottom.qml	2016-03-16 15:08:49 +0000
4528
+++ qml/Tutorial/TutorialBottom.qml	2016-04-20 17:09:16 +0000
4529
@@ -47,7 +47,7 @@
4530
47
    readonly property real sideStageWidth: root.usageScenario === "tablet" && stage.sideStageVisible ?
47
    readonly property real sideStageWidth: root.usageScenario === "tablet" && stage.sideStageVisible ?
4531
48
                                           stage.sideStageWidth : 0
48
                                           stage.sideStageWidth : 0
4532
49
    readonly property bool isMainStageApp: usageScenario !== "tablet" ||
49
    readonly property bool isMainStageApp: usageScenario !== "tablet" ||
4534
50
                                           application.stage === ApplicationInfoInterface.MainStage
50
                                           stage.stageFocusedSurface === ApplicationInfoInterface.MainStage
4535
51
    readonly property real dragAreaHeight: units.gu(3) // based on PageWithBottomEdge.qml
51
    readonly property real dragAreaHeight: units.gu(3) // based on PageWithBottomEdge.qml
4536
52
    readonly property real targetDistance: height * 0.2 + dragAreaHeight // based on PageWithBottomEdge.qml
52
    readonly property real targetDistance: height * 0.2 + dragAreaHeight // based on PageWithBottomEdge.qml
4537
53
53
4538
54
54
4539
=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
4540
--- tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-03-16 12:29:44 +0000
4541
+++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-04-20 17:09:16 +0000
4542
@@ -16,8 +16,7 @@
4543
16
16
4544
17
#include "ApplicationInfo.h"
17
#include "ApplicationInfo.h"
4545
18
#include "MirSurface.h"
18
#include "MirSurface.h"
4548
19
#include "Session.h"
19
#include "SurfaceManager.h"
4547
20
#include "SessionManager.h"
4549
21
20
4550
22
#include <paths.h>
21
#include <paths.h>
4551
23
22
4552
@@ -25,97 +24,114 @@
4553
25
#include <QQuickItem>
24
#include <QQuickItem>
4554
26
#include <QQuickView>
25
#include <QQuickView>
4555
27
#include <QQmlComponent>
26
#include <QQmlComponent>
4557
28
#include <QTimer>
27
4558
28
#define APPLICATION_DEBUG 0
4559
29
4560
30
#if APPLICATION_DEBUG
4561
31
#define DEBUG_MSG(params) qDebug().nospace() << "Application["<<appId()<<"]::" << __func__  << " " << params
4562
32
4563
33
QString stateToStr(ApplicationInfo::State state)
4564
34
{
4565
35
    switch (state) {
4566
36
    case ApplicationInfo::Starting:
4567
37
        return "starting";
4568
38
    case ApplicationInfo::Running:
4569
39
        return "running";
4570
40
    case ApplicationInfo::Suspended:
4571
41
        return "suspended";
4572
42
    case ApplicationInfo::Stopped:
4573
43
        return "stopped";
4574
44
    default:
4575
45
        return "???";
4576
46
    };
4577
47
}
4578
48
4579
49
#else
4580
50
#define DEBUG_MSG(params) ((void)0)
4581
51
#endif
4582
52
4583
53
#define WARNING_MSG(params) qWarning().nospace() << "Application["<<appId()<<"]::" << __func__  << " " << params
4584
29
54
4585
30
ApplicationInfo::ApplicationInfo(const QString &appId, QObject *parent)
55
ApplicationInfo::ApplicationInfo(const QString &appId, QObject *parent)
4586
31
    : ApplicationInfoInterface(appId, parent)
56
    : ApplicationInfoInterface(appId, parent)
4587
32
    , m_appId(appId)
57
    , m_appId(appId)
4588
33
    , m_stage(MainStage)
4589
34
    , m_state(Stopped)
4590
35
    , m_focused(false)
4591
36
    , m_fullscreen(false)
4592
37
    , m_session(0)
4593
38
    , m_supportedOrientations(Qt::PortraitOrientation |
4594
39
            Qt::LandscapeOrientation |
4595
40
            Qt::InvertedPortraitOrientation |
4596
41
            Qt::InvertedLandscapeOrientation)
4597
42
    , m_rotatesWindowContents(false)
4598
43
    , m_requestedState(RequestedRunning)
4599
44
    , m_isTouchApp(true)
4600
45
    , m_exemptFromLifecycle(false)
4601
46
    , m_manualSurfaceCreation(false)
4602
47
    , m_shellChrome(Mir::NormalChrome)
4603
48
{
58
{
4604
59
    connect(&m_surfaceList, &MirSurfaceListModel::countChanged,
4605
60
        this, &ApplicationInfo::onSurfaceCountChanged, Qt::QueuedConnection);
4606
61
4607
62
    m_surfaceCreationTimer.setSingleShot(true);
4608
63
    m_surfaceCreationTimer.setInterval(500);
4609
64
    connect(&m_surfaceCreationTimer, &QTimer::timeout, this, &ApplicationInfo::createSurface);
4610
49
}
65
}
4611
50
66
4612
51
ApplicationInfo::ApplicationInfo(QObject *parent)
67
ApplicationInfo::ApplicationInfo(QObject *parent)
4629
52
    : ApplicationInfoInterface(QString(), parent)
68
    : ApplicationInfo(QString(), parent)
4614
53
    , m_stage(MainStage)
4615
54
    , m_state(Stopped)
4616
55
    , m_focused(false)
4617
56
    , m_fullscreen(false)
4618
57
    , m_session(0)
4619
58
    , m_supportedOrientations(Qt::PortraitOrientation |
4620
59
            Qt::LandscapeOrientation |
4621
60
            Qt::InvertedPortraitOrientation |
4622
61
            Qt::InvertedLandscapeOrientation)
4623
62
    , m_rotatesWindowContents(false)
4624
63
    , m_requestedState(RequestedRunning)
4625
64
    , m_isTouchApp(true)
4626
65
    , m_exemptFromLifecycle(false)
4627
66
    , m_manualSurfaceCreation(false)
4628
67
    , m_shellChrome(Mir::NormalChrome)
4630
68
{
69
{
4631
69
}
70
}
4632
70
71
4633
71
ApplicationInfo::~ApplicationInfo()
72
ApplicationInfo::~ApplicationInfo()
4634
72
{
73
{
4655
73
    delete m_session;
74
}
4656
74
}
75
4657
75
76
void ApplicationInfo::createSurface()
4658
76
void ApplicationInfo::createSession()
77
{
4659
77
{
78
    if (state() == ApplicationInfo::Stopped) { return; }
4660
78
    if (m_session || state() == ApplicationInfo::Stopped) { return; }
79
4661
79
80
    QString surfaceName = name();
4662
80
    setSession(SessionManager::singleton()->createSession(appId(), m_screenshotFileName));
81
    if (m_surfaceList.count() > 0) {
4663
81
}
82
        surfaceName.append(QString(" %1").arg(m_surfaceList.count()+1));
4664
82
83
    }
4665
83
void ApplicationInfo::destroySession()
84
4666
84
{
85
    auto surfaceManager = SurfaceManager::instance();
4667
85
    Session *session = this->session();
86
    if (!surfaceManager) {
4668
86
    setSession(nullptr);
87
        WARNING_MSG("No SurfaceManager");
4649
87
    delete session;
4650
88
}
4651
89
4652
90
void ApplicationInfo::setSession(Session* session)
4653
91
{
4654
92
    if (m_session == session)
4669
93
        return;
88
        return;
4695
94
89
    }
4696
95
    if (m_session) {
90
4697
96
        disconnect(this, 0, m_session, 0);
91
    auto surface = surfaceManager->createSurface(surfaceName,
4698
97
        m_session->setApplication(nullptr);
92
           Mir::NormalType,
4699
98
        m_session->setParent(nullptr);
93
           fullscreen() ? Mir::FullscreenState : Mir::MaximizedState,
4700
99
        Q_EMIT m_session->deregister();
94
           m_screenshotFileName);
4701
100
    }
95
4702
101
96
    surface->setShellChrome(m_shellChrome);
4703
102
    m_session = session;
97
4704
103
98
    m_surfaceList.appendSurface(surface);
4705
104
    if (m_session) {
99
4706
105
        m_session->setApplication(this);
100
    ++m_liveSurfaceCount;
4707
106
        m_session->setParent(this);
101
    connect(surface, &MirSurface::liveChanged, this, [this, surface](){
4708
107
        m_session->setFullscreen(m_fullscreen);
102
        if (!surface->live()) {
4709
108
        SessionManager::singleton()->registerSession(m_session);
103
            --m_liveSurfaceCount;
4710
109
        connect(m_session, &Session::surfaceAdded,
104
            if (m_liveSurfaceCount == 0) {
4711
110
                this, &ApplicationInfo::onSessionSurfaceAdded);
105
                if (m_closingSurfaces.contains(surface)
4712
111
        connect(m_session, &Session::fullscreenChanged, this, &ApplicationInfo::fullscreenChanged);
106
                        || (m_state == Running && m_requestedState == RequestedRunning)) {
4713
112
107
                    Q_EMIT closed();
4714
113
        if (!m_manualSurfaceCreation) {
108
                }
4715
114
            QTimer::singleShot(500, m_session, &Session::createSurface);
109
                setState(Stopped);
4716
115
        }
110
            } else {
4717
116
    }
111
                if (m_closingSurfaces.contains(surface) && m_requestedState == RequestedSuspended
4718
117
112
                        && m_closingSurfaces.count() == 1) {
4719
118
    Q_EMIT sessionChanged(m_session);
113
                    setState(Suspended);
4720
114
                }
4721
115
            }
4722
116
            m_closingSurfaces.removeAll(surface);
4723
117
        }
4724
118
    });
4725
119
    connect(surface, &MirSurface::closeRequested, this, [this, surface](){
4726
120
        m_closingSurfaces.append(surface);
4727
121
        if (m_state == Suspended) {
4728
122
            // resume to allow application to close its surface
4729
123
            setState(Running);
4730
124
        }
4731
125
    });
4732
126
    connect(surface, &MirSurface::focusRequested, this, &ApplicationInfo::focusRequested);
4733
127
4734
128
    if (m_state == Starting) {
4735
129
        if (m_requestedState == RequestedRunning) {
4736
130
            setState(Running);
4737
131
        } else {
4738
132
            setState(Suspended);
4739
133
        }
4740
134
    }
4741
119
}
135
}
4742
120
136
4743
121
void ApplicationInfo::setIconId(const QString &iconId)
137
void ApplicationInfo::setIconId(const QString &iconId)
4744
@@ -138,10 +154,6 @@
4745
138
154
4746
139
    if (screenshotFileName != m_screenshotFileName) {
155
    if (screenshotFileName != m_screenshotFileName) {
4747
140
        m_screenshotFileName = screenshotFileName;
156
        m_screenshotFileName = screenshotFileName;
4748
141
4749
142
        if (m_session) {
4750
143
            m_session->setScreenshot(screenshotFileName);
4751
144
        }
4752
145
    }
157
    }
4753
146
}
158
}
4754
147
159
4755
@@ -172,38 +184,53 @@
4756
172
void ApplicationInfo::setState(State value)
184
void ApplicationInfo::setState(State value)
4757
173
{
185
{
4758
174
    if (value != m_state) {
186
    if (value != m_state) {
4759
187
        DEBUG_MSG(qPrintable(stateToStr(value)));
4760
188
        if (!m_manualSurfaceCreation && value == ApplicationInfo::Starting) {
4761
189
            Q_ASSERT(m_surfaceList.count() == 0);
4762
190
            m_surfaceCreationTimer.start();
4763
191
        } else if (value == ApplicationInfo::Stopped) {
4764
192
            m_surfaceCreationTimer.stop();
4765
193
            for (int i = 0; i < m_surfaceList.count(); ++i) {
4766
194
                MirSurface *surface = static_cast<MirSurface*>(m_surfaceList.get(i));
4767
195
                surface->setLive(false);
4768
196
            }
4769
197
        }
4770
198
4771
175
        m_state = value;
199
        m_state = value;
4772
176
        Q_EMIT stateChanged(value);
200
        Q_EMIT stateChanged(value);
4780
177
201
    }
4781
178
        if (!m_manualSurfaceCreation && !m_session && m_state == ApplicationInfo::Starting) {
202
}
4782
179
            QTimer::singleShot(500, this, &ApplicationInfo::createSession);
203
4783
180
        } else if (m_state == ApplicationInfo::Stopped) {
204
void ApplicationInfo::close()
4784
181
            Session *session = m_session;
205
{
4785
182
            setSession(nullptr);
206
    DEBUG_MSG("");
4786
183
            delete session;
207
4787
208
    if (m_surfaceList.count() > 0) {
4788
209
        for (int i = 0; i < m_surfaceList.count(); ++i) {
4789
210
            MirSurface *surface = static_cast<MirSurface*>(m_surfaceList.get(i));
4790
211
            surface->close();
4791
184
        }
212
        }
4800
185
    }
213
    } else {
4801
186
}
214
        setState(Stopped);
4802
187
215
        Q_EMIT closed();
4795
188
void ApplicationInfo::setFocused(bool value)
4796
189
{
4797
190
    if (value != m_focused) {
4798
191
        m_focused = value;
4799
192
        Q_EMIT focusedChanged(value);
4803
193
    }
216
    }
4804
194
}
217
}
4805
195
218
4806
196
void ApplicationInfo::setFullscreen(bool value)
219
void ApplicationInfo::setFullscreen(bool value)
4807
197
{
220
{
4808
198
    m_fullscreen = value;
221
    m_fullscreen = value;
4811
199
    if (m_session) {
222
    if (m_surfaceList.rowCount() > 0) {
4812
200
        m_session->setFullscreen(value);
223
        m_surfaceList.get(0)->setState(Mir::FullscreenState);
4813
201
    }
224
    }
4814
202
}
225
}
4815
203
226
4816
204
bool ApplicationInfo::fullscreen() const
227
bool ApplicationInfo::fullscreen() const
4817
205
{
228
{
4819
206
    return m_session ? m_session->fullscreen() : m_fullscreen;
229
    if (m_surfaceList.rowCount() > 0) {
4820
230
        return m_surfaceList.get(0)->state() == Mir::FullscreenState;
4821
231
    } else {
4822
232
        return m_fullscreen;
4823
233
    }
4824
207
}
234
}
4825
208
235
4826
209
void ApplicationInfo::setManualSurfaceCreation(bool value)
236
void ApplicationInfo::setManualSurfaceCreation(bool value)
4827
@@ -241,15 +268,28 @@
4828
241
268
4829
242
void ApplicationInfo::setRequestedState(RequestedState value)
269
void ApplicationInfo::setRequestedState(RequestedState value)
4830
243
{
270
{
4836
244
    if (m_requestedState != value) {
271
    if (m_requestedState == value) {
4837
245
        m_requestedState = value;
272
        return;
4838
246
        Q_EMIT requestedStateChanged(m_requestedState);
273
    }
4839
247
274
    DEBUG_MSG((value == RequestedRunning ? "RequestedRunning" : "RequestedSuspended") );
4840
248
        if (m_requestedState == RequestedRunning && m_state == Suspended) {
275
4841
276
    m_requestedState = value;
4842
277
    Q_EMIT requestedStateChanged(m_requestedState);
4843
278
4844
279
    if (m_requestedState == RequestedRunning) {
4845
280
4846
281
        if (m_state == Suspended) {
4847
282
            Q_ASSERT(m_liveSurfaceCount > 0);
4848
249
            setState(Running);
283
            setState(Running);
4851
250
        } else if (m_requestedState == RequestedSuspended && m_state == Running) {
284
        } else if (m_state == Stopped) {
4852
251
            setState(Suspended);
285
            Q_ASSERT(m_liveSurfaceCount == 0);
4853
286
            // it's restarting
4854
287
            setState(Starting);
4855
252
        }
288
        }
4856
289
4857
290
    } else if (m_requestedState == RequestedSuspended && m_state == Running
4858
291
            && m_closingSurfaces.isEmpty()) {
4859
292
        setState(Suspended);
4860
253
    }
293
    }
4861
254
}
294
}
4862
255
295
4863
@@ -263,18 +303,6 @@
4864
263
    m_isTouchApp = isTouchApp;
303
    m_isTouchApp = isTouchApp;
4865
264
}
304
}
4866
265
305
4867
266
void ApplicationInfo::onSessionSurfaceAdded(MirSurface* surface)
4868
267
{
4869
268
    if (surface != nullptr && m_state == Starting) {
4870
269
        if (m_requestedState == RequestedRunning) {
4871
270
            setState(Running);
4872
271
        } else {
4873
272
            setState(Suspended);
4874
273
        }
4875
274
        surface->setShellChrome(m_shellChrome);
4876
275
    }
4877
276
}
4878
277
4879
278
bool ApplicationInfo::exemptFromLifecycle() const
306
bool ApplicationInfo::exemptFromLifecycle() const
4880
279
{
307
{
4881
280
    return m_exemptFromLifecycle;
308
    return m_exemptFromLifecycle;
4882
@@ -305,7 +333,52 @@
4883
305
void ApplicationInfo::setShellChrome(Mir::ShellChrome shellChrome)
333
void ApplicationInfo::setShellChrome(Mir::ShellChrome shellChrome)
4884
306
{
334
{
4885
307
    m_shellChrome = shellChrome;
335
    m_shellChrome = shellChrome;
4888
308
    if (m_session && m_session->lastSurface()) {
336
    if (m_surfaceList.rowCount() > 0) {
4889
309
        m_session->lastSurface()->setShellChrome(shellChrome);
337
        static_cast<MirSurface*>(m_surfaceList.get(0))->setShellChrome(shellChrome);
4890
338
    }
4891
339
}
4892
340
4893
341
bool ApplicationInfo::focused() const
4894
342
{
4895
343
    bool someSurfaceHasFocus = false; // to be proven wrong
4896
344
    for (int i = 0; i < m_surfaceList.count() && !someSurfaceHasFocus; ++i) {
4897
345
        someSurfaceHasFocus = m_surfaceList.get(i)->focused();
4898
346
    }
4899
347
    return someSurfaceHasFocus;
4900
348
}
4901
349
4902
350
void ApplicationInfo::setFocused(bool value)
4903
351
{
4904
352
    if (focused() == value) {
4905
353
        return;
4906
354
    }
4907
355
4908
356
    if (value) {
4909
357
        if (m_surfaceList.count() > 0) {
4910
358
            m_surfaceList.get(0)->requestFocus();
4911
359
        }
4912
360
    } else {
4913
361
        for (int i = 0; i < m_surfaceList.count(); ++i) {
4914
362
            MirSurface *surface = static_cast<MirSurface*>(m_surfaceList.get(i));
4915
363
            if (surface->focused()) {
4916
364
                surface->setFocused(false);
4917
365
            }
4918
366
        }
4919
367
    }
4920
368
}
4921
369
4922
370
void ApplicationInfo::onSurfaceCountChanged()
4923
371
{
4924
372
    if (m_surfaceList.count() == 0 && m_state == Running) {
4925
373
        setState(Stopped);
4926
374
    }
4927
375
}
4928
376
4929
377
void ApplicationInfo::requestFocus()
4930
378
{
4931
379
    if (m_surfaceList.count() == 0) {
4932
380
        Q_EMIT focusRequested();
4933
381
    } else {
4934
382
        m_surfaceList.get(0)->requestFocus();
4935
310
    }
383
    }
4936
311
}
384
}
4937
312
385
4938
=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
4939
--- tests/mocks/Unity/Application/ApplicationInfo.h	2016-03-15 20:59:07 +0000
4940
+++ tests/mocks/Unity/Application/ApplicationInfo.h	2016-04-20 17:09:16 +0000
4941
@@ -20,25 +20,32 @@
4942
20
#include <QObject>
20
#include <QObject>
4943
21
21
4944
22
class MirSurface;
22
class MirSurface;
4945
23
class Session;
4946
24
23
4947
25
// unity-api
24
// unity-api
4948
26
#include <unity/shell/application/ApplicationInfoInterface.h>
25
#include <unity/shell/application/ApplicationInfoInterface.h>
4949
27
#include <unity/shell/application/Mir.h>
26
#include <unity/shell/application/Mir.h>
4950
28
27
4951
28
#include "MirSurfaceListModel.h"
4952
29
4953
30
#include <QList>
4954
31
#include <QTimer>
4955
32
4956
29
using namespace unity::shell::application;
33
using namespace unity::shell::application;
4957
30
34
4958
31
class ApplicationInfo : public ApplicationInfoInterface {
35
class ApplicationInfo : public ApplicationInfoInterface {
4959
32
    Q_OBJECT
36
    Q_OBJECT
4960
33
37
4961
38
    ////
4962
39
    // FIXME: Remove those
4963
34
    Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged)
40
    Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged)
4964
35
    Q_PROPERTY(Session* session READ session NOTIFY sessionChanged)
4965
36
41
4966
37
    // Only exists in this fake implementation
42
    // Only exists in this fake implementation
4967
38
43
4968
39
    // whether the test code will explicitly control the creation of the application surface
44
    // whether the test code will explicitly control the creation of the application surface
4969
40
    Q_PROPERTY(bool manualSurfaceCreation READ manualSurfaceCreation WRITE setManualSurfaceCreation NOTIFY manualSurfaceCreationChanged)
45
    Q_PROPERTY(bool manualSurfaceCreation READ manualSurfaceCreation WRITE setManualSurfaceCreation NOTIFY manualSurfaceCreationChanged)
4970
41
46
4971
47
    Q_PROPERTY(QString screenshot READ screenshot CONSTANT)
4972
48
4973
42
public:
49
public:
4974
43
    ApplicationInfo(QObject *parent = nullptr);
50
    ApplicationInfo(QObject *parent = nullptr);
4975
44
    ApplicationInfo(const QString &appId, QObject *parent = nullptr);
51
    ApplicationInfo(const QString &appId, QObject *parent = nullptr);
4976
@@ -66,8 +73,7 @@
4977
66
    Q_INVOKABLE void setState(State value);
73
    Q_INVOKABLE void setState(State value);
4978
67
    State state() const override { return m_state; }
74
    State state() const override { return m_state; }
4979
68
75
4982
69
    void setFocused(bool value);
76
    bool focused() const override;
4981
70
    bool focused() const override { return m_focused; }
4983
71
77
4984
72
    QString splashTitle() const override { return QString(); }
78
    QString splashTitle() const override { return QString(); }
4985
73
    QUrl splashImage() const override { return QUrl(); }
79
    QUrl splashImage() const override { return QUrl(); }
4986
@@ -100,21 +106,26 @@
4987
100
    void setInitialSurfaceSize(const QSize &size) override;
106
    void setInitialSurfaceSize(const QSize &size) override;
4988
101
107
4989
102
    Q_INVOKABLE void setShellChrome(Mir::ShellChrome shellChrome);
108
    Q_INVOKABLE void setShellChrome(Mir::ShellChrome shellChrome);
4993
103
public:
109
4994
104
    void setSession(Session* session);
110
    MirSurfaceListInterface* surfaceList() override { return &m_surfaceList; }
4995
105
    Session* session() const { return m_session; }
111
4996
112
    void setFocused(bool value);
4997
113
4998
114
    //////
4999
115
    // internal mock stuff
5000
116
    void close();
Status:	Merged
Approved by:	Michał Sawicz on 2016-04-22
Approved revision:	2360
Merged at revision:	2336
Proposed branch:	lp:~dandrader/unity8/surfaceListModel
Merge into:	lp:unity8
Prerequisite:	lp:~dandrader/unity8/declarativeKeymap
Diff against target:	11952 lines (+4061/-2915) 78 files modified debian/control (+1/-1) debian/unity8-private.install (+1/-0) plugins/CMakeLists.txt (+1/-0) plugins/WindowManager/CMakeLists.txt (+13/-0) plugins/WindowManager/TopLevelSurfaceList.cpp (+486/-0) plugins/WindowManager/TopLevelSurfaceList.h (+223/-0) plugins/WindowManager/WindowManagerPlugin.cpp (+28/-0) plugins/WindowManager/WindowManagerPlugin.h (+32/-0) plugins/WindowManager/qmldir (+2/-0) qml/Components/KeymapSwitcher.qml (+1/-9) qml/Greeter/Greeter.qml (+5/-4) qml/Launcher/LauncherPanel.qml (+1/-0) qml/Shell.qml (+67/-53) qml/Stages/AbstractStage.qml (+9/-2) qml/Stages/Animations/BaseSessionAnimation.qml (+0/-96) qml/Stages/Animations/SwipeFromBottomAnimation.qml (+0/-53) qml/Stages/ApplicationWindow.qml (+110/-68) qml/Stages/DecoratedWindow.qml (+5/-5) qml/Stages/DesktopSpread.qml (+22/-18) qml/Stages/DesktopSpreadDelegate.qml (+4/-3) qml/Stages/DesktopStage.qml (+162/-101) qml/Stages/PhoneStage.qml (+154/-91) qml/Stages/PromptSurfaceAnimations.qml (+81/-0) qml/Stages/SpreadDelegate.qml (+4/-3) qml/Stages/StagedFullscreenPolicy.qml (+12/-14) qml/Stages/SurfaceContainer.qml (+0/-154) qml/Stages/TabletStage.qml (+312/-249) qml/Stages/TopLevelSurfaceRepeater.qml (+52/-0) qml/Stages/TransformedSpreadDelegate.qml (+4/-4) qml/Stages/TransformedTabletSpreadDelegate.qml (+29/-23) qml/Stages/WindowedFullscreenPolicy.qml (+5/-7) qml/Tutorial/TutorialBottom.qml (+1/-1) tests/mocks/Unity/Application/ApplicationInfo.cpp (+195/-122) tests/mocks/Unity/Application/ApplicationInfo.h (+39/-24) tests/mocks/Unity/Application/ApplicationManager.cpp (+115/-80) tests/mocks/Unity/Application/ApplicationManager.h (+12/-14) tests/mocks/Unity/Application/ApplicationTestInterface.cpp (+0/-117) tests/mocks/Unity/Application/ApplicationTestInterface.h (+0/-45) tests/mocks/Unity/Application/CMakeLists.txt (+3/-4) tests/mocks/Unity/Application/MirSurface.cpp (+175/-10) tests/mocks/Unity/Application/MirSurface.h (+51/-7) tests/mocks/Unity/Application/MirSurfaceItem.cpp (+13/-7) tests/mocks/Unity/Application/MirSurfaceListModel.cpp (+121/-0) tests/mocks/Unity/Application/MirSurfaceListModel.h (+56/-0) tests/mocks/Unity/Application/ObjectListModel.h (+2/-0) tests/mocks/Unity/Application/Session.cpp (+0/-209) tests/mocks/Unity/Application/Session.h (+0/-104) tests/mocks/Unity/Application/SessionManager.cpp (+0/-55) tests/mocks/Unity/Application/SessionManager.h (+0/-44) tests/mocks/Unity/Application/SessionModel.h (+0/-35) tests/mocks/Unity/Application/SurfaceManager.cpp (+16/-9) tests/mocks/Unity/Application/SurfaceManager.h (+5/-2) tests/mocks/Unity/Application/UbuntuKeyboardInfo.cpp (+0/-2) tests/mocks/Unity/Application/UbuntuKeyboardInfo.h (+0/-9) tests/mocks/Unity/Application/VirtualKeyboard.cpp (+2/-3) tests/mocks/Unity/Application/VirtualKeyboard.h (+1/-1) tests/mocks/Unity/Application/plugin.cpp (+41/-44) tests/mocks/Utils/CMakeLists.txt (+4/-0) tests/mocks/Utils/plugin.cpp (+1/-1) tests/plugins/Unity/Launcher/launchermodeltest.cpp (+2/-3) tests/qmltests/CMakeLists.txt (+0/-1) tests/qmltests/Dash/tst_DashShell.qml (+6/-2) tests/qmltests/Greeter/tst_Greeter.qml (+2/-2) tests/qmltests/Panel/tst_ActiveCallHint.qml (+3/-2) tests/qmltests/Panel/tst_Panel.qml (+2/-2) tests/qmltests/Stages/ApplicationCheckBox.qml (+117/-71) tests/qmltests/Stages/RecursingChildSessionControl.qml (+10/-61) tests/qmltests/Stages/tst_ApplicationWindow.qml (+84/-70) tests/qmltests/Stages/tst_DesktopStage.qml (+253/-171) tests/qmltests/Stages/tst_PhoneStage.qml (+272/-82) tests/qmltests/Stages/tst_SpreadDelegate.qml (+3/-2) tests/qmltests/Stages/tst_SurfaceContainer.qml (+0/-184) tests/qmltests/Stages/tst_TabletStage.qml (+255/-92) tests/qmltests/Tutorial/tst_Tutorial.qml (+4/-8) tests/qmltests/tst_OrientedShell.qml (+96/-69) tests/qmltests/tst_Shell.qml (+244/-171) tests/qmltests/tst_ShellWithPin.qml (+9/-13) tests/utils/modules/Unity/Test/UnityTestCase.qml (+20/-2)
To merge this branch:	bzr merge lp:~dandrader/unity8/surfaceListModel
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michał Sawicz			Approve on 2016-04-22
Unity8 CI Bot	continuous-integration	2016-03-29	Needs Fixing on 2016-04-20
Lukáš Tinkl (community)			Approve on 2016-04-15
Gerry Boland (community)		2016-03-29	Approve on 2016-04-11
Nick Dedekind (community)			Needs Fixing on 2016-03-30
Review via email: mp+290314@code.launchpad.net