1
=== modified file 'debian/unity8.install'
2
--- debian/unity8.install	2016-06-20 22:42:46 +0000
3
+++ debian/unity8.install	2016-10-11 21:49:13 +0000
4
@@ -16,7 +16,7 @@
5
16
usr/share/unity8/OrientedShell.qml
16
usr/share/unity8/OrientedShell.qml
6
17
usr/share/unity8/DisabledScreenNotice.qml
17
usr/share/unity8/DisabledScreenNotice.qml
7
18
usr/share/unity8/Shell.qml
18
usr/share/unity8/Shell.qml
9
19
usr/share/unity8/Stages
19
usr/share/unity8/Stage
10
20
usr/share/unity8/Tutorial
20
usr/share/unity8/Tutorial
11
21
usr/share/unity8/Wizard
21
usr/share/unity8/Wizard
12
22
usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher
22
usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher
13
23
23
14
=== modified file 'plugins/Ubuntu/Gestures/TouchGate.cpp'
15
--- plugins/Ubuntu/Gestures/TouchGate.cpp	2016-07-13 07:29:00 +0000
16
+++ plugins/Ubuntu/Gestures/TouchGate.cpp	2016-10-11 21:49:13 +0000
17
@@ -61,7 +61,10 @@
18
61
        const QTouchEvent::TouchPoint &touchPoint = touchPoints[i];
61
        const QTouchEvent::TouchPoint &touchPoint = touchPoints[i];
19
62
62
20
63
        if (touchPoint.state() == Qt::TouchPointPressed) {
63
        if (touchPoint.state() == Qt::TouchPointPressed) {
22
64
            Q_ASSERT(!m_touchInfoMap.contains(touchPoint.id()));
64
// FIXME: This assert triggers frequently in make trySomething. We have verified
23
65
// that it's a bug in the mouse to touch conversion of the test environment
24
66
// and not in the actual product. Still, it probably should be cleaned up eventually.
25
67
//            Q_ASSERT(!m_touchInfoMap.contains(touchPoint.id()));
26
65
            m_touchInfoMap[touchPoint.id()].ownership = OwnershipRequested;
68
            m_touchInfoMap[touchPoint.id()].ownership = OwnershipRequested;
27
66
            m_touchInfoMap[touchPoint.id()].ended = false;
69
            m_touchInfoMap[touchPoint.id()].ended = false;
28
67
            TouchRegistry::instance()->requestTouchOwnership(touchPoint.id(), this);
70
            TouchRegistry::instance()->requestTouchOwnership(touchPoint.id(), this);
29
68
71
30
=== modified file 'plugins/WindowManager/TopLevelSurfaceList.cpp'
31
--- plugins/WindowManager/TopLevelSurfaceList.cpp	2016-04-04 13:43:41 +0000
32
+++ plugins/WindowManager/TopLevelSurfaceList.cpp	2016-10-11 21:49:13 +0000
33
@@ -133,11 +133,6 @@
34
133
133
35
134
void TopLevelSurfaceList::connectSurface(MirSurfaceInterface *surface)
134
void TopLevelSurfaceList::connectSurface(MirSurfaceInterface *surface)
36
135
{
135
{
37
136
    connect(surface, &MirSurfaceInterface::focusedChanged, this, [this, surface](bool focused){
38
137
            if (focused) {
39
138
                this->raise(surface);
40
139
            }
41
140
        });
42
141
    connect(surface, &MirSurfaceInterface::liveChanged, this, [this, surface](bool live){
136
    connect(surface, &MirSurfaceInterface::liveChanged, this, [this, surface](bool live){
43
142
            if (!live) {
137
            if (!live) {
44
143
                onSurfaceDied(surface);
138
                onSurfaceDied(surface);
45
144
139
46
=== modified file 'qml/CMakeLists.txt'
47
--- qml/CMakeLists.txt	2015-03-06 04:44:11 +0000
48
+++ qml/CMakeLists.txt	2016-10-11 21:49:13 +0000
49
@@ -12,7 +12,7 @@
50
12
    Launcher
12
    Launcher
51
13
    Notifications
13
    Notifications
52
14
    Panel
14
    Panel
54
15
    Stages
15
    Stage
55
16
    Rotation
16
    Rotation
56
17
    Tutorial
17
    Tutorial
57
18
    Wizard
18
    Wizard
58
19
19
59
=== modified file 'qml/Components/EdgeBarrier.qml'
60
--- qml/Components/EdgeBarrier.qml	2016-02-15 16:43:56 +0000
61
+++ qml/Components/EdgeBarrier.qml	2016-10-11 21:49:13 +0000
62
@@ -29,6 +29,8 @@
63
29
    // Supported values are: Qt.LeftEdge, Qt.RightEdge
29
    // Supported values are: Qt.LeftEdge, Qt.RightEdge
64
30
    property int edge: Qt.LeftEdge
30
    property int edge: Qt.LeftEdge
65
31
31
66
32
    readonly property alias progress: controller.progress
67
33
68
32
    property Item target: parent
34
    property Item target: parent
69
33
    function push(amount) { controller.push(amount); }
35
    function push(amount) { controller.push(amount); }
70
34
    signal passed()
36
    signal passed()
71
35
37
72
=== modified file 'qml/Components/FloatingFlickable.qml'
73
--- qml/Components/FloatingFlickable.qml	2016-08-08 10:41:38 +0000
74
+++ qml/Components/FloatingFlickable.qml	2016-10-11 21:49:13 +0000
75
@@ -35,6 +35,9 @@
76
35
    property alias contentX: flickable.contentX
35
    property alias contentX: flickable.contentX
77
36
    property alias contentY: flickable.contentY
36
    property alias contentY: flickable.contentY
78
37
    property alias direction: swipeArea.direction
37
    property alias direction: swipeArea.direction
79
38
    property alias leftMargin: flickable.leftMargin
80
39
    property alias rightMargin: flickable.rightMargin
81
40
    property alias dragging: flickable.dragging
82
38
41
83
39
    MouseEventGenerator {
42
    MouseEventGenerator {
84
40
        id: mouseEventGenerator
43
        id: mouseEventGenerator
85
41
44
86
=== modified file 'qml/Components/InputMethod.qml'
87
--- qml/Components/InputMethod.qml	2016-06-30 13:51:32 +0000
88
+++ qml/Components/InputMethod.qml	2016-10-11 21:49:13 +0000
89
@@ -21,7 +21,7 @@
90
21
Item {
21
Item {
91
22
    id: root
22
    id: root
92
23
23
94
24
    readonly property rect visibleRect: surfaceItem.surface ? surfaceItem.surface.inputBounds : Qt.rect(0, 0, 0, 0)
24
    readonly property rect visibleRect: surfaceItem.surface && visible ? surfaceItem.surface.inputBounds : Qt.rect(0, 0, 0, 0)
95
25
25
96
26
    MirSurfaceItem {
26
    MirSurfaceItem {
97
27
        id: surfaceItem
27
        id: surfaceItem
98
28
28
99
=== modified file 'qml/Greeter/LoginAreaContainer.qml'
100
--- qml/Greeter/LoginAreaContainer.qml	2016-06-14 17:34:35 +0000
101
+++ qml/Greeter/LoginAreaContainer.qml	2016-10-11 21:49:13 +0000
102
@@ -26,7 +26,7 @@
103
26
            rightMargin: -units.gu(1.5)
26
            rightMargin: -units.gu(1.5)
104
27
            bottomMargin: -units.gu(1.5)
27
            bottomMargin: -units.gu(1.5)
105
28
        }
28
        }
107
29
        source: "../Stages/graphics/dropshadow2gu.sci"
29
        source: "../graphics/dropshadow2gu.sci"
108
30
        opacity: 0.35
30
        opacity: 0.35
109
31
    }
31
    }
110
32
32
111
33
33
112
=== modified file 'qml/Notifications/Notification.qml'
113
--- qml/Notifications/Notification.qml	2016-08-19 13:27:05 +0000
114
+++ qml/Notifications/Notification.qml	2016-10-11 21:49:13 +0000
115
@@ -143,7 +143,7 @@
116
143
            fill: contents
143
            fill: contents
117
144
            margins: shapedBack.visible ? -units.gu(1) : -units.gu(1.5)
144
            margins: shapedBack.visible ? -units.gu(1) : -units.gu(1.5)
118
145
        }
145
        }
120
146
        source: "../Stages/graphics/dropshadow2gu.sci"
146
        source: "../graphics/dropshadow2gu.sci"
121
147
        opacity: notification.opacity * 0.5
147
        opacity: notification.opacity * 0.5
122
148
        enabled: !fullscreen
148
        enabled: !fullscreen
123
149
    }
149
    }
124
150
150
125
=== modified file 'qml/Rotation/RotationStates.qml'
126
--- qml/Rotation/RotationStates.qml	2016-04-29 12:52:53 +0000
127
+++ qml/Rotation/RotationStates.qml	2016-10-11 21:49:13 +0000
128
@@ -121,12 +121,6 @@
129
121
            }
121
            }
130
122
        }
122
        }
131
123
123
132
124
        property var shellBeingResized: Binding {
133
125
            target: root.shell
134
126
            property: "beingResized"
135
127
            value: d.transitioning
136
128
        }
137
129
138
130
        readonly property int fullAnimation: 0
124
        readonly property int fullAnimation: 0
139
131
        readonly property int indicatorsBarAnimation: 1
125
        readonly property int indicatorsBarAnimation: 1
140
132
        readonly property int noAnimation: 2
126
        readonly property int noAnimation: 2
141
133
127
142
=== modified file 'qml/Shell.qml'
143
--- qml/Shell.qml	2016-09-22 07:42:01 +0000
144
+++ qml/Shell.qml	2016-10-11 21:49:13 +0000
145
@@ -35,7 +35,7 @@
146
35
import "Panel"
35
import "Panel"
147
36
import "Components"
36
import "Components"
148
37
import "Notifications"
37
import "Notifications"
150
38
import "Stages"
38
import "Stage"
151
39
import "Tutorial"
39
import "Tutorial"
152
40
import "Wizard"
40
import "Wizard"
153
41
import Unity.Notifications 1.0 as NotificationBackend
41
import Unity.Notifications 1.0 as NotificationBackend
154
@@ -58,24 +58,22 @@
155
58
    property real nativeWidth
58
    property real nativeWidth
156
59
    property real nativeHeight
59
    property real nativeHeight
157
60
    property alias indicatorAreaShowProgress: panel.indicatorAreaShowProgress
60
    property alias indicatorAreaShowProgress: panel.indicatorAreaShowProgress
158
61
    property bool beingResized
159
62
    property string usageScenario: "phone" // supported values: "phone", "tablet" or "desktop"
61
    property string usageScenario: "phone" // supported values: "phone", "tablet" or "desktop"
160
63
    property string mode: "full-greeter"
62
    property string mode: "full-greeter"
161
64
    property alias oskEnabled: inputMethod.enabled
63
    property alias oskEnabled: inputMethod.enabled
162
65
    function updateFocusedAppOrientation() {
64
    function updateFocusedAppOrientation() {
164
66
        applicationsDisplayLoader.item.updateFocusedAppOrientation();
65
        stage.updateFocusedAppOrientation();
165
67
    }
66
    }
166
68
    function updateFocusedAppOrientationAnimated() {
67
    function updateFocusedAppOrientationAnimated() {
168
69
        applicationsDisplayLoader.item.updateFocusedAppOrientationAnimated();
68
        stage.updateFocusedAppOrientationAnimated();
169
70
    }
69
    }
170
71
    property bool hasMouse: false
70
    property bool hasMouse: false
171
72
71
172
73
    // to be read from outside
72
    // to be read from outside
175
74
    readonly property int mainAppWindowOrientationAngle:
73
    readonly property int mainAppWindowOrientationAngle: stage.mainAppWindowOrientationAngle
174
75
            applicationsDisplayLoader.item ? applicationsDisplayLoader.item.mainAppWindowOrientationAngle : 0
176
76
74
177
77
    readonly property bool orientationChangesEnabled: panel.indicators.fullyClosed
75
    readonly property bool orientationChangesEnabled: panel.indicators.fullyClosed
179
78
            && (applicationsDisplayLoader.item && applicationsDisplayLoader.item.orientationChangesEnabled)
76
            && stage.orientationChangesEnabled
180
79
            && (!greeter || !greeter.animating)
77
            && (!greeter || !greeter.animating)
181
80
78
182
81
    readonly property bool showingGreeter: greeter && greeter.shown
79
    readonly property bool showingGreeter: greeter && greeter.shown
183
@@ -89,19 +87,13 @@
184
89
            return Qt.PrimaryOrientation;
87
            return Qt.PrimaryOrientation;
185
90
        } else if (showingGreeter || notifications.topmostIsFullscreen) {
88
        } else if (showingGreeter || notifications.topmostIsFullscreen) {
186
91
            return Qt.PrimaryOrientation;
89
            return Qt.PrimaryOrientation;
187
92
        } else if (applicationsDisplayLoader.item) {
188
93
            return shell.orientations.map(applicationsDisplayLoader.item.supportedOrientations);
189
94
        } else {
90
        } else {
195
95
            // we just don't care
91
            return shell.orientations.map(stage.supportedOrientations);
191
96
            return Qt.PortraitOrientation
192
97
                 | Qt.LandscapeOrientation
193
98
                 | Qt.InvertedPortraitOrientation
194
99
                 | Qt.InvertedLandscapeOrientation;
196
100
        }
92
        }
197
101
    }
93
    }
198
102
94
201
103
    readonly property var mainApp:
95
    readonly property var mainApp: stage.mainApp
202
104
            applicationsDisplayLoader.item ? applicationsDisplayLoader.item.mainApp : null
96
203
105
    onMainAppChanged: {
97
    onMainAppChanged: {
204
106
        if (mainApp) {
98
        if (mainApp) {
205
107
            _onMainAppChanged(mainApp.appId);
99
            _onMainAppChanged(mainApp.appId);
206
@@ -278,154 +270,50 @@
207
278
            applicationsModel: ApplicationManager
270
            applicationsModel: ApplicationManager
208
279
        }
271
        }
209
280
272
213
281
        Loader {
273
        Stage {
214
282
            id: applicationsDisplayLoader
274
            id: stage
215
283
            objectName: "applicationsDisplayLoader"
275
            objectName: "stage"
216
284
            anchors.fill: parent
276
            anchors.fill: parent
226
285
277
            focus: true
227
286
            // When we have a locked app, we only want to show that one app.
278
228
287
            // FIXME: do this in a less traumatic way.  We currently only allow
279
            dragAreaWidth: shell.edgeSize
229
288
            // locked apps in phone mode (see FIXME in Lockscreen component in
280
            background: wallpaperResolver.background
230
289
            // this same file).  When that changes, we need to do something
281
            leftEdgeDragProgress: !greeter || greeter.locked || !tutorial.launcherLongSwipeEnabled ? 0 :
231
290
            // nicer here.  But this code is currently just to prevent a
282
                                Math.max(0, (launcher.dragDistance * (stage.width - launcher.panelWidth) / stage.width) - launcher.panelWidth)
232
291
            // theoretical attack where user enters lockedApp mode, then makes
283
233
292
            // the screen larger (maybe connects to monitor) and tries to enter
284
            applicationManager: ApplicationManager
234
293
            // tablet mode.
285
            topLevelSurfaceList: topLevelSurfaceList
235
286
            inputMethodRect: inputMethod.visibleRect
236
294
287
237
295
            property string usageScenario: shell.usageScenario === "phone" || greeter.hasLockedApp
288
            property string usageScenario: shell.usageScenario === "phone" || greeter.hasLockedApp
259
296
                                           ? "phone"
289
                                                       ? "phone"
260
297
                                           : shell.usageScenario
290
                                                       : shell.usageScenario
261
298
            readonly property string qmlComponent: {
291
262
299
                if (applicationsDisplayLoader.usageScenario === "phone") {
292
            mode: usageScenario == "phone" ? "staged"
263
300
                    return "Stages/PhoneStage.qml";
293
                     : usageScenario == "tablet" ? "stagedWithSideStage"
264
301
                } else if (applicationsDisplayLoader.usageScenario === "tablet") {
294
                     : "windowed"
265
302
                    return "Stages/TabletStage.qml";
295
266
303
                } else {
296
            shellOrientation: shell.orientation
267
304
                    return "Stages/DesktopStage.qml";
297
            shellOrientationAngle: shell.orientationAngle
268
305
                }
298
            orientations: shell.orientations
269
306
            }
299
            nativeWidth: shell.nativeWidth
270
307
            // TODO: Ensure the current stage is destroyed before the new one gets loaded.
300
            nativeHeight: shell.nativeHeight
271
308
            //       Currently the new one will get loaded while the old is still hanging
301
272
309
            //       around for a bit, which might lead to conflicts where both stages
302
            interactive: (!greeter || !greeter.shown)
252
310
            //       change the model simultaneously.
253
311
            onQmlComponentChanged: {
254
312
                if (item) item.stageAboutToBeUnloaded();
255
313
                source = qmlComponent;
256
314
            }
257
315
258
316
            property bool interactive: (!greeter || !greeter.shown)
273
317
                    && panel.indicators.fullyClosed
303
                    && panel.indicators.fullyClosed
274
318
                    && launcher.progress == 0
304
                    && launcher.progress == 0
275
319
                    && !notifications.useModal
305
                    && !notifications.useModal
276
320
306
277
321
            onInteractiveChanged: { if (interactive) { focus = true; } }
307
            onInteractiveChanged: { if (interactive) { focus = true; } }
278
322
308
385
323
            Binding {
309
            leftMargin: shell.usageScenario == "desktop" && !settings.autohideLauncher ? launcher.panelWidth: 0
386
324
                target: applicationsDisplayLoader.item
310
            suspended: greeter.shown
387
325
                property: "focus"
311
            keepDashRunning: launcher.shown || launcher.dashSwipe
388
326
                value: true
312
            altTabPressed: physicalKeysMapper.altTabPressed
389
327
            }
313
            oskEnabled: shell.oskEnabled
390
328
            Binding {
314
391
329
                target: applicationsDisplayLoader.item
315
            // TODO: This is not implemented yet in the new stage...
392
330
                property: "objectName"
316
            spreadEnabled: tutorial.spreadEnabled && (!greeter || (!greeter.hasLockedApp && !greeter.shown))
287
331
                value: "stage"
288
332
            }
289
333
            Binding {
290
334
                target: applicationsDisplayLoader.item
291
335
                property: "dragAreaWidth"
292
336
                value: shell.edgeSize
293
337
            }
294
338
            Binding {
295
339
                target: applicationsDisplayLoader.item
296
340
                property: "maximizedAppTopMargin"
297
341
                // Not just using panel.panelHeight as that changes depending on the focused app.
298
342
                value: panel.indicators.minimizedPanelHeight
299
343
            }
300
344
            Binding {
301
345
                target: applicationsDisplayLoader.item
302
346
                property: "interactive"
303
347
                value: applicationsDisplayLoader.interactive
304
348
            }
305
349
            Binding {
306
350
                target: applicationsDisplayLoader.item
307
351
                property: "spreadEnabled"
308
352
                value: tutorial.spreadEnabled && (!greeter || (!greeter.hasLockedApp && !greeter.shown))
309
353
            }
310
354
            Binding {
311
355
                target: applicationsDisplayLoader.item
312
356
                property: "inverseProgress"
313
357
                value: !greeter || greeter.locked || !tutorial.launcherLongSwipeEnabled ? 0 : launcher.progress
314
358
            }
315
359
            Binding {
316
360
                target: applicationsDisplayLoader.item
317
361
                property: "shellOrientationAngle"
318
362
                value: shell.orientationAngle
319
363
            }
320
364
            Binding {
321
365
                target: applicationsDisplayLoader.item
322
366
                property: "shellOrientation"
323
367
                value: shell.orientation
324
368
            }
325
369
            Binding {
326
370
                target: applicationsDisplayLoader.item
327
371
                property: "orientations"
328
372
                value: shell.orientations
329
373
            }
330
374
            Binding {
331
375
                target: applicationsDisplayLoader.item
332
376
                property: "background"
333
377
                value: wallpaperResolver.cachedBackground
334
378
            }
335
379
            Binding {
336
380
                target: applicationsDisplayLoader.item
337
381
                property: "nativeWidth"
338
382
                value: shell.nativeWidth
339
383
            }
340
384
            Binding {
341
385
                target: applicationsDisplayLoader.item
342
386
                property: "nativeHeight"
343
387
                value: shell.nativeHeight
344
388
            }
345
389
            Binding {
346
390
                target: applicationsDisplayLoader.item
347
391
                property: "beingResized"
348
392
                value: shell.beingResized
349
393
            }
350
394
            Binding {
351
395
                target: applicationsDisplayLoader.item
352
396
                property: "keepDashRunning"
353
397
                value: launcher.shown || launcher.dashSwipe
354
398
            }
355
399
            Binding {
356
400
                target: applicationsDisplayLoader.item
357
401
                property: "suspended"
358
402
                value: greeter.shown
359
403
            }
360
404
            Binding {
361
405
                target: applicationsDisplayLoader.item
362
406
                property: "altTabPressed"
363
407
                value: physicalKeysMapper.altTabPressed
364
408
            }
365
409
            Binding {
366
410
                target: applicationsDisplayLoader.item
367
411
                property: "leftMargin"
368
412
                value: shell.usageScenario == "desktop" && !settings.autohideLauncher ? launcher.panelWidth: 0
369
413
            }
370
414
            Binding {
371
415
                target: applicationsDisplayLoader.item
372
416
                property: "applicationManager"
373
417
                value: ApplicationManager
374
418
            }
375
419
            Binding {
376
420
                target: applicationsDisplayLoader.item
377
421
                property: "topLevelSurfaceList"
378
422
                value: topLevelSurfaceList
379
423
            }
380
424
            Binding {
381
425
                target: applicationsDisplayLoader.item
382
426
                property: "oskEnabled"
383
427
                value: shell.oskEnabled
384
428
            }
393
429
        }
317
        }
394
430
    }
318
    }
395
431
319
396
@@ -442,6 +330,7 @@
397
442
330
398
443
    Loader {
331
    Loader {
399
444
        id: greeterLoader
332
        id: greeterLoader
400
333
        objectName: "greeterLoader"
401
445
        anchors.fill: parent
334
        anchors.fill: parent
402
446
        anchors.topMargin: panel.panelHeight
335
        anchors.topMargin: panel.panelHeight
403
447
        sourceComponent: shell.mode != "shell" ? integratedGreeter :
336
        sourceComponent: shell.mode != "shell" ? integratedGreeter :
404
@@ -650,7 +539,7 @@
405
650
            }
539
            }
406
651
            onFocusChanged: {
540
            onFocusChanged: {
407
652
                if (!focus) {
541
                if (!focus) {
409
653
                    applicationsDisplayLoader.focus = true;
542
                    stage.focus = true;
410
654
                }
543
                }
411
655
            }
544
            }
412
656
545
413
@@ -706,12 +595,12 @@
414
706
            delayed: dialogs.hasActiveDialog || notifications.hasNotification ||
595
            delayed: dialogs.hasActiveDialog || notifications.hasNotification ||
415
707
                     inputMethod.visible ||
596
                     inputMethod.visible ||
416
708
                     (launcher.shown && !launcher.lockedVisible) ||
597
                     (launcher.shown && !launcher.lockedVisible) ||
418
709
                     panel.indicators.shown || stage.dragProgress > 0
598
                     panel.indicators.shown || stage.rightEdgeDragProgress > 0
419
710
            usageScenario: shell.usageScenario
599
            usageScenario: shell.usageScenario
420
711
            lastInputTimestamp: inputFilter.lastInputTimestamp
600
            lastInputTimestamp: inputFilter.lastInputTimestamp
421
712
            launcher: launcher
601
            launcher: launcher
422
713
            panel: panel
602
            panel: panel
424
714
            stage: applicationsDisplayLoader.item
603
            stage: stage
425
715
        }
604
        }
426
716
605
427
717
        Wizard {
606
        Wizard {
428
@@ -802,7 +691,7 @@
429
802
        z: dialogs.z + 10
691
        z: dialogs.z + 10
430
803
        GlobalShortcut { shortcut: Qt.Key_Print; onTriggered: itemGrabber.capture(shell) }
692
        GlobalShortcut { shortcut: Qt.Key_Print; onTriggered: itemGrabber.capture(shell) }
431
804
        Connections {
693
        Connections {
433
805
            target: applicationsDisplayLoader.item
694
            target: stage
434
806
            ignoreUnknownSignals: true
695
            ignoreUnknownSignals: true
435
807
            onItemSnapshotRequested: itemGrabber.capture(item)
696
            onItemSnapshotRequested: itemGrabber.capture(item)
436
808
        }
697
        }
437
@@ -814,7 +703,7 @@
438
814
        z: itemGrabber.z + 1
703
        z: itemGrabber.z + 1
439
815
        topBoundaryOffset: panel.panelHeight
704
        topBoundaryOffset: panel.panelHeight
440
816
705
442
817
        confiningItem: applicationsDisplayLoader.item ? applicationsDisplayLoader.item.itemConfiningMouseCursor : null
706
        confiningItem: stage.itemConfiningMouseCursor
443
818
707
444
819
        property bool mouseNeverMoved: true
708
        property bool mouseNeverMoved: true
445
820
        Binding {
709
        Binding {
446
@@ -828,10 +717,9 @@
447
828
717
448
829
        height: units.gu(3)
718
        height: units.gu(3)
449
830
719
454
831
        readonly property var previewRectangle: applicationsDisplayLoader.item && applicationsDisplayLoader.item.previewRectangle &&
720
        readonly property var previewRectangle: stage.previewRectangle.target &&
455
832
                                                applicationsDisplayLoader.item.previewRectangle.target &&
721
                                                stage.previewRectangle.target.dragging ?
456
833
                                                applicationsDisplayLoader.item.previewRectangle.target.dragging ?
722
                                                stage.previewRectangle : null
453
834
                                                    applicationsDisplayLoader.item.previewRectangle : null
457
835
723
458
836
        onPushedLeftBoundary: {
724
        onPushedLeftBoundary: {
459
837
            if (buttons === Qt.NoButton) {
725
            if (buttons === Qt.NoButton) {
460
@@ -842,9 +730,8 @@
461
842
        }
730
        }
462
843
731
463
844
        onPushedRightBoundary: {
732
        onPushedRightBoundary: {
467
845
            if (buttons === Qt.NoButton && applicationsDisplayLoader.item
733
            if (buttons === Qt.NoButton) {
468
846
                    && applicationsDisplayLoader.item.pushRightEdge) {
734
                stage.pushRightEdge(amount);
466
847
                applicationsDisplayLoader.item.pushRightEdge(amount);
469
848
            } else if (buttons === Qt.LeftButton && previewRectangle && previewRectangle.target.canBeMaximizedLeftRight) {
735
            } else if (buttons === Qt.LeftButton && previewRectangle && previewRectangle.target.canBeMaximizedLeftRight) {
470
849
                previewRectangle.maximizeRight(amount);
736
                previewRectangle.maximizeRight(amount);
471
850
            }
737
            }
472
851
738
473
=== renamed directory 'qml/Stages' => 'qml/Stage'
474
=== modified file 'qml/Stage/ApplicationWindow.qml'
475
--- qml/Stages/ApplicationWindow.qml	2016-08-08 11:18:19 +0000
476
+++ qml/Stage/ApplicationWindow.qml	2016-10-11 21:49:13 +0000
477
@@ -20,8 +20,8 @@
478
20
20
479
21
FocusScope {
21
FocusScope {
480
22
    id: root
22
    id: root
483
23
    implicitWidth: surfaceContainer.implicitWidth
23
    implicitWidth: requestedWidth
484
24
    implicitHeight: surfaceContainer.implicitHeight
24
    implicitHeight: requestedHeight
485
25
25
486
26
    // to be read from outside
26
    // to be read from outside
487
27
    property alias interactive: surfaceContainer.interactive
27
    property alias interactive: surfaceContainer.interactive
488
@@ -29,22 +29,10 @@
489
29
    readonly property string title: surface && surface.name !== "" ? surface.name : d.name
29
    readonly property string title: surface && surface.name !== "" ? surface.name : d.name
490
30
    readonly property QtObject focusedSurface: d.focusedSurface.surface
30
    readonly property QtObject focusedSurface: d.focusedSurface.surface
491
31
31
492
32
    // overridable from outside
493
33
    property bool fullscreen: {
494
34
        if (surface) {
495
35
            return surface.state === Mir.FullscreenState;
496
36
        } else if (application) {
497
37
            return application.fullscreen;
498
38
        } else {
499
39
            return false;
500
40
        }
501
41
    }
502
42
503
43
    // to be set from outside
32
    // to be set from outside
504
44
    property QtObject surface
33
    property QtObject surface
505
45
    property QtObject application
34
    property QtObject application
506
46
    property int surfaceOrientationAngle
35
    property int surfaceOrientationAngle
507
47
    property alias resizeSurface: surfaceContainer.resizeSurface
508
48
    property int requestedWidth: -1
36
    property int requestedWidth: -1
509
49
    property int requestedHeight: -1
37
    property int requestedHeight: -1
510
50
    property real splashRotation: 0
38
    property real splashRotation: 0
511
@@ -156,6 +144,9 @@
512
156
        id: screenshotImage
144
        id: screenshotImage
513
157
        objectName: "screenshotImage"
145
        objectName: "screenshotImage"
514
158
        anchors.fill: parent
146
        anchors.fill: parent
515
147
        fillMode: Image.PreserveAspectCrop
516
148
        horizontalAlignment: Image.AlignLeft
517
149
        verticalAlignment: Image.AlignTop
518
159
        antialiasing: !root.interactive
150
        antialiasing: !root.interactive
519
160
        z: 1
151
        z: 1
520
161
152
521
@@ -197,6 +188,7 @@
522
197
188
523
198
    SurfaceContainer {
189
    SurfaceContainer {
524
199
        id: surfaceContainer
190
        id: surfaceContainer
525
191
        anchors.fill: parent
526
200
        z: splashLoader.z + 1
192
        z: splashLoader.z + 1
527
201
        requestedWidth: root.requestedWidth
193
        requestedWidth: root.requestedWidth
528
202
        requestedHeight: root.requestedHeight
194
        requestedHeight: root.requestedHeight
529
@@ -220,6 +212,8 @@
530
220
            surface: model.surface
212
            surface: model.surface
531
221
            width: root.width
213
            width: root.width
532
222
            height: root.height
214
            height: root.height
533
215
            requestedWidth: root.requestedWidth
534
216
            requestedHeight: root.requestedHeight
535
223
            isPromptSurface: true
217
            isPromptSurface: true
536
224
            z: surfaceContainer.z + (promptSurfacesRepeater.count - index)
218
            z: surfaceContainer.z + (promptSurfacesRepeater.count - index)
537
225
            property int index: model.index
219
            property int index: model.index
538
@@ -239,28 +233,6 @@
539
239
        property Item first: null
233
        property Item first: null
540
240
    }
234
    }
541
241
235
542
242
    // SurfaceContainer size drives ApplicationWindow size
543
243
    Binding {
544
244
        target: root; property: "width"
545
245
        value: stateGroup.state === "surface" ? surfaceContainer.width : root.requestedWidth
546
246
        when: root.requestedWidth >= 0
547
247
    }
548
248
    Binding {
549
249
        target: root; property: "height"
550
250
        value: stateGroup.state === "surface" ? surfaceContainer.height : root.requestedHeight
551
251
        when: root.requestedHeight >= 0
552
252
    }
553
253
554
254
    // ApplicationWindow size drives SurfaceContainer size
555
255
    Binding {
556
256
        target: surfaceContainer; property: "width"; value: root.width
557
257
        when: root.requestedWidth < 0
558
258
    }
559
259
    Binding {
560
260
        target: surfaceContainer; property: "height"; value: root.height
561
261
        when: root.requestedHeight < 0
562
262
    }
563
263
564
264
    StateGroup {
236
    StateGroup {
565
265
        id: stateGroup
237
        id: stateGroup
566
266
        objectName: "applicationWindowStateGroup"
238
        objectName: "applicationWindowStateGroup"
567
@@ -287,6 +259,11 @@
568
287
                      (d.liveSurface ||
259
                      (d.liveSurface ||
569
288
                       (d.applicationState !== ApplicationInfoInterface.Running
260
                       (d.applicationState !== ApplicationInfoInterface.Running
570
289
                        && screenshotImage.status !== Image.Ready))
261
                        && screenshotImage.status !== Image.Ready))
571
262
                PropertyChanges {
572
263
                    target: root
573
264
                    implicitWidth: surfaceContainer.implicitWidth
574
265
                    implicitHeight: surfaceContainer.implicitHeight
575
266
                }
576
290
            },
267
            },
577
291
            State {
268
            State {
578
292
                name: "screenshot"
269
                name: "screenshot"
579
@@ -424,5 +401,4 @@
580
424
            }
401
            }
581
425
        ]
402
        ]
582
426
    }
403
    }
583
427
584
428
}
404
}
585
429
405
586
=== modified file 'qml/Stage/DecoratedWindow.qml'
587
--- qml/Stages/DecoratedWindow.qml	2016-09-08 14:13:27 +0000
588
+++ qml/Stage/DecoratedWindow.qml	2016-10-11 21:49:13 +0000
589
@@ -17,34 +17,46 @@
590
17
import QtQuick 2.4
17
import QtQuick 2.4
591
18
import Ubuntu.Components 1.3
18
import Ubuntu.Components 1.3
592
19
import Unity.Application 0.1
19
import Unity.Application 0.1
593
20
import "Spread/MathUtils.js" as MathUtils
594
20
21
595
21
FocusScope {
22
FocusScope {
596
22
    id: root
23
    id: root
597
23
24
600
24
    width: !counterRotate ? applicationWindow.width : applicationWindow.height
25
    // The DecoratedWindow takes requestedWidth/requestedHeight and asks its surface to be resized to that
601
25
    height: visibleDecorationHeight + (!counterRotate ? applicationWindow.height : applicationWindow.width)
26
    // (minus the window decoration size in case hasDecoration and showDecoration are true)
602
27
    // The surface might not be able to resize to the requested values. It will return its actual size
603
28
    // in implicitWidth/implicitHeight.
604
26
29
605
27
    property alias application: applicationWindow.application
30
    property alias application: applicationWindow.application
606
28
    property alias surface: applicationWindow.surface
31
    property alias surface: applicationWindow.surface
607
29
    readonly property alias focusedSurface: applicationWindow.focusedSurface
32
    readonly property alias focusedSurface: applicationWindow.focusedSurface
608
30
    property alias active: decoration.active
33
    property alias active: decoration.active
609
31
    readonly property alias title: applicationWindow.title
34
    readonly property alias title: applicationWindow.title
610
32
    property alias fullscreen: applicationWindow.fullscreen
611
33
    property alias maximizeButtonShown: decoration.maximizeButtonShown
35
    property alias maximizeButtonShown: decoration.maximizeButtonShown
612
36
    property alias interactive: applicationWindow.interactive
613
37
    readonly property alias orientationChangesEnabled: applicationWindow.orientationChangesEnabled
614
34
38
618
35
    readonly property bool decorationShown: !fullscreen
39
    // Changing this will actually add/remove a decoration, meaning, requestedHeight will take the decoration into account.
619
36
    property bool highlightShown: false
40
    property bool hasDecoration: true
620
37
    property real shadowOpacity: 1
41
    // This will temporarily show/hide the decoration without actually changing the surface's dimensions
621
42
    property real showDecoration: 1
622
43
    property bool animateDecoration: false
623
44
    property bool showHighlight: false
624
45
    property int highlightSize: units.gu(1)
625
46
    property real shadowOpacity: 0
626
47
    property bool darkening: false
627
38
48
628
39
    property real requestedWidth
49
    property real requestedWidth
629
40
    property real requestedHeight
50
    property real requestedHeight
630
51
    property real scaleToPreviewProgress: 0
631
52
    property int scaleToPreviewSize: units.gu(30)
632
41
53
633
42
    property alias surfaceOrientationAngle: applicationWindow.surfaceOrientationAngle
54
    property alias surfaceOrientationAngle: applicationWindow.surfaceOrientationAngle
635
43
    readonly property real visibleDecorationHeight: root.decorationShown ? decoration.height : 0
55
    readonly property real decorationHeight: Math.min(d.visibleDecorationHeight, d.requestedDecorationHeight)
636
44
    readonly property bool counterRotate: surfaceOrientationAngle != 0 && surfaceOrientationAngle != 180
56
    readonly property bool counterRotate: surfaceOrientationAngle != 0 && surfaceOrientationAngle != 180
637
45
57
638
46
    readonly property int minimumWidth: !counterRotate ? applicationWindow.minimumWidth : applicationWindow.minimumHeight
58
    readonly property int minimumWidth: !counterRotate ? applicationWindow.minimumWidth : applicationWindow.minimumHeight
640
47
    readonly property int minimumHeight: visibleDecorationHeight + (!counterRotate ? applicationWindow.minimumHeight : applicationWindow.minimumWidth)
59
    readonly property int minimumHeight: decorationHeight + (!counterRotate ? applicationWindow.minimumHeight : applicationWindow.minimumWidth)
641
48
    readonly property int maximumWidth: !counterRotate ? applicationWindow.maximumWidth : applicationWindow.maximumHeight
60
    readonly property int maximumWidth: !counterRotate ? applicationWindow.maximumWidth : applicationWindow.maximumHeight
642
49
    readonly property int maximumHeight: (root.decorationShown && applicationWindow.maximumHeight > 0 ? decoration.height : 0)
61
    readonly property int maximumHeight: (root.decorationShown && applicationWindow.maximumHeight > 0 ? decoration.height : 0)
643
50
                                         + (!counterRotate ? applicationWindow.maximumHeight : applicationWindow.maximumWidth)
62
                                         + (!counterRotate ? applicationWindow.maximumHeight : applicationWindow.maximumWidth)
644
@@ -66,40 +78,86 @@
645
66
    signal decorationPressed()
78
    signal decorationPressed()
646
67
    signal decorationReleased()
79
    signal decorationReleased()
647
68
80
648
81
    QtObject {
649
82
        id: d
650
83
        property int requestedDecorationHeight: root.hasDecoration ? decoration.height : 0
651
84
        Behavior on requestedDecorationHeight { enabled: root.animateDecoration; UbuntuNumberAnimation { } }
652
85
653
86
        property int visibleDecorationHeight: root.hasDecoration ? root.showDecoration * decoration.height : 0
654
87
        Behavior on visibleDecorationHeight { enabled: root.animateDecoration; UbuntuNumberAnimation { } }
655
88
    }
656
89
657
90
    StateGroup {
658
91
        states: [
659
92
            State {
660
93
                name: "normal"; when: root.scaleToPreviewProgress <= 0 && root.application.state === ApplicationInfoInterface.Running
661
94
                PropertyChanges {
662
95
                    target: root
663
96
                    implicitWidth: counterRotate ? applicationWindow.implicitHeight : applicationWindow.implicitWidth
664
97
                    implicitHeight: root.decorationHeight + (counterRotate ? applicationWindow.implicitWidth:  applicationWindow.implicitHeight)
665
98
                }
666
99
            },
667
100
            State {
668
101
                name: "normalSuspended"; when: root.scaleToPreviewProgress <= 0 && root.application.state !== ApplicationInfoInterface.Running
669
102
                extend: "normal"
670
103
                PropertyChanges {
671
104
                    target: root
672
105
                    implicitWidth: counterRotate ? applicationWindow.requestedHeight : applicationWindow.requestedWidth
673
106
                    implicitHeight: root.decorationHeight + (counterRotate ? applicationWindow.requestedWidth:  applicationWindow.requestedHeight)
674
107
                }
675
108
            },
676
109
            State {
677
110
                name: "preview"; when: root.scaleToPreviewProgress > 0
678
111
                PropertyChanges {
679
112
                    target: root
680
113
                    implicitWidth: MathUtils.linearAnimation(0, 1, applicationWindow.oldRequestedWidth, root.scaleToPreviewSize, root.scaleToPreviewProgress)
681
114
                    implicitHeight: MathUtils.linearAnimation(0, 1, applicationWindow.oldRequestedHeight, root.scaleToPreviewSize, root.scaleToPreviewProgress)
682
115
                }
683
116
                PropertyChanges {
684
117
                    target: applicationWindow;
685
118
                    requestedWidth: applicationWindow.oldRequestedWidth
686
119
                    requestedHeight: applicationWindow.oldRequestedHeight
687
120
                    width: MathUtils.linearAnimation(0, 1, applicationWindow.oldRequestedWidth, applicationWindow.minSize, root.scaleToPreviewProgress)
688
121
                    height: MathUtils.linearAnimation(0, 1, applicationWindow.oldRequestedHeight, applicationWindow.minSize, root.scaleToPreviewProgress)
689
122
                    itemScale: root.implicitWidth / width
690
123
                }
691
124
            }
692
125
        ]
693
126
    }
694
127
695
69
    Rectangle {
128
    Rectangle {
696
70
        id: selectionHighlight
129
        id: selectionHighlight
697
130
        objectName: "selectionHighlight"
698
71
        anchors.fill: parent
131
        anchors.fill: parent
700
72
        anchors.margins: -units.gu(1)
132
        anchors.margins: -root.highlightSize
701
73
        color: "white"
133
        color: "white"
710
74
        opacity: highlightShown ? 0.15 : 0
134
        opacity: showHighlight ? 0.55 : 0
711
75
    }
135
        visible: opacity > 0
704
76
705
77
    Rectangle {
706
78
        anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }
707
79
        height: units.dp(2)
708
80
        color: theme.palette.normal.focus
709
81
        visible: highlightShown
712
82
    }
136
    }
713
83
137
714
84
    BorderImage {
138
    BorderImage {
715
139
        id: dropShadow
716
85
        anchors {
140
        anchors {
718
86
            fill: root
141
            left: parent.left; top: parent.top; right: parent.right
719
87
            margins: active ? -units.gu(2) : -units.gu(1.5)
142
            margins: active ? -units.gu(2) : -units.gu(1.5)
720
88
        }
143
        }
724
89
        source: "graphics/dropshadow2gu.sci"
144
        height: Math.min(applicationWindow.implicitHeight, applicationWindow.height) * applicationWindow.itemScale
725
90
        opacity: root.shadowOpacity * .3
145
                + root.decorationHeight * Math.min(1, root.showDecoration) + (active ? units.gu(4) : units.gu(3))
726
91
        visible: !fullscreen
146
        source: "../graphics/dropshadow2gu.sci"
727
147
        opacity: root.shadowOpacity
728
92
    }
148
    }
729
93
149
730
94
    WindowDecoration {
150
    WindowDecoration {
731
95
        id: decoration
151
        id: decoration
733
96
        target: root.parent
152
        target: root.parent || null
734
97
        objectName: "appWindowDecoration"
153
        objectName: "appWindowDecoration"
735
98
        anchors { left: parent.left; top: parent.top; right: parent.right }
154
        anchors { left: parent.left; top: parent.top; right: parent.right }
736
99
        height: units.gu(3)
155
        height: units.gu(3)
737
100
        width: root.width
156
        width: root.width
738
101
        title: applicationWindow.title
157
        title: applicationWindow.title
740
102
        visible: root.decorationShown
158
        opacity: root.hasDecoration ? Math.min(1, root.showDecoration) : 0
741
159
742
160
        Behavior on opacity { UbuntuNumberAnimation { } }
743
103
161
744
104
        onCloseClicked: root.closeClicked();
162
        onCloseClicked: root.closeClicked();
745
105
        onMaximizeClicked: { root.decorationPressed(); root.maximizeClicked(); }
163
        onMaximizeClicked: { root.decorationPressed(); root.maximizeClicked(); }
746
@@ -126,16 +184,25 @@
747
126
    ApplicationWindow {
184
    ApplicationWindow {
748
127
        id: applicationWindow
185
        id: applicationWindow
749
128
        objectName: "appWindow"
186
        objectName: "appWindow"
750
187
        anchors.left: parent.left
751
129
        anchors.top: parent.top
188
        anchors.top: parent.top
758
130
        anchors.topMargin: decoration.height
189
        anchors.topMargin: root.decorationHeight * Math.min(1, root.showDecoration)
759
131
        anchors.left: parent.left
190
        width: implicitWidth
760
132
        readonly property real requestedHeightMinusDecoration: root.requestedHeight - root.visibleDecorationHeight
191
        height: implicitHeight
761
133
        requestedHeight: !counterRotate ? requestedHeightMinusDecoration : root.requestedWidth
192
        requestedHeight: !counterRotate ? root.requestedHeight - d.requestedDecorationHeight : root.requestedWidth
762
134
        requestedWidth: !counterRotate ? root.requestedWidth : requestedHeightMinusDecoration
193
        requestedWidth: !counterRotate ? root.requestedWidth : root.requestedHeight - d.requestedDecorationHeight
763
135
        interactive: true
194
        property int oldRequestedWidth: requestedWidth
764
195
        property int oldRequestedHeight: requestedHeight
765
196
        onRequestedWidthChanged: oldRequestedWidth = requestedWidth
766
197
        onRequestedHeightChanged: oldRequestedHeight = requestedHeight
767
136
        focus: true
198
        focus: true
768
137
199
770
138
        transform: Rotation {
200
        property real itemScale: 1
771
201
        property real minSize: Math.min(root.scaleToPreviewSize, Math.min(requestedHeight, Math.min(requestedWidth, Math.min(implicitHeight, implicitWidth))))
772
202
773
203
        transform: [
774
204
            Rotation {
775
205
                id: rotationTransform
776
139
                readonly property int rotationAngle: applicationWindow.application &&
206
                readonly property int rotationAngle: applicationWindow.application &&
777
140
                                                     applicationWindow.application.rotatesWindowContents
207
                                                     applicationWindow.application.rotatesWindowContents
778
141
                                                     ? ((360 - applicationWindow.surfaceOrientationAngle) % 360) : 0
208
                                                     ? ((360 - applicationWindow.surfaceOrientationAngle) % 360) : 0
779
@@ -152,6 +219,19 @@
780
152
                    else return 0;
219
                    else return 0;
781
153
                }
220
                }
782
154
                angle: rotationAngle
221
                angle: rotationAngle
784
155
        }
222
            },
785
223
            Scale {
786
224
                xScale: applicationWindow.itemScale
787
225
                yScale: applicationWindow.itemScale
788
226
            }
789
227
        ]
790
228
791
229
    }
792
230
793
231
    Rectangle {
794
232
        anchors.fill: parent
795
233
        color: "black"
796
234
        opacity: root.darkening && !root.showHighlight ? 0.05 : 0
797
235
        Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
798
156
    }
236
    }
799
157
}
237
}
800
158
238
801
=== modified file 'qml/Stage/MoveHandler.qml'
802
--- qml/Stages/MoveHandler.qml	2016-09-08 14:13:27 +0000
803
+++ qml/Stage/MoveHandler.qml	2016-10-11 21:49:13 +0000
804
@@ -112,8 +112,8 @@
805
112
            // Use integer coordinate values to ensure that target is left in a pixel-aligned
112
            // Use integer coordinate values to ensure that target is left in a pixel-aligned
806
113
            // position. Mouse movement could have subpixel precision, yielding a fractional
113
            // position. Mouse movement could have subpixel precision, yielding a fractional
807
114
            // mouse position.
114
            // mouse position.
810
115
            target.requestedX = Math.round(pos.x - priv.distanceX);
115
            target.windowedX = Math.round(pos.x - priv.distanceX);
811
116
            target.requestedY = Math.round(Math.max(pos.y - priv.distanceY, PanelState.panelHeight));
116
            target.windowedY = Math.round(Math.max(pos.y - priv.distanceY, PanelState.panelHeight));
812
117
117
813
118
            if (sensingPoints) { // edge/corner detection when dragging via the touch overlay
118
            if (sensingPoints) { // edge/corner detection when dragging via the touch overlay
814
119
                if (sensingPoints.topLeft.x < priv.triggerArea && sensingPoints.topLeft.y < PanelState.panelHeight + priv.triggerArea
119
                if (sensingPoints.topLeft.x < priv.triggerArea && sensingPoints.topLeft.y < PanelState.panelHeight + priv.triggerArea
815
120
120
816
=== modified file 'qml/Stage/PromptSurfaceAnimations.qml'
817
--- qml/Stages/PromptSurfaceAnimations.qml	2016-04-04 13:38:56 +0000
818
+++ qml/Stage/PromptSurfaceAnimations.qml	2016-10-11 21:49:13 +0000
819
@@ -43,7 +43,7 @@
820
43
            SequentialAnimation {
43
            SequentialAnimation {
821
44
                // clip so we don't go out of parent's bounds during spread
44
                // clip so we don't go out of parent's bounds during spread
822
45
                PropertyAction { target: root.container.parent; property: "clip"; value: true }
45
                PropertyAction { target: root.container.parent; property: "clip"; value: true }
824
46
                UbuntuNumberAnimation { target: root.surfaceItem; property: "y"; to: root.container.height
46
                UbuntuNumberAnimation { target: root.surfaceItem; property: "anchors.topMargin"; to: root.container.height
825
47
                                        duration: UbuntuAnimation.BriskDuration }
47
                                        duration: UbuntuAnimation.BriskDuration }
826
48
                PropertyAction { target: root.surfaceItem; property: "visible"; value: false }
48
                PropertyAction { target: root.surfaceItem; property: "visible"; value: false }
827
49
                PropertyAction { target: container.parent; property: "clip"; value: false }
49
                PropertyAction { target: container.parent; property: "clip"; value: false }
828
@@ -61,11 +61,10 @@
829
61
                // clip so we don't go out of parent's bounds during spread
61
                // clip so we don't go out of parent's bounds during spread
830
62
                PropertyAction { target: root.container.parent; property: "clip"; value: true }
62
                PropertyAction { target: root.container.parent; property: "clip"; value: true }
831
63
                ScriptAction { script: {
63
                ScriptAction { script: {
832
64
                    root.surfaceItem.y = root.container.height;
833
65
                    root.surfaceItem.visible = true;
64
                    root.surfaceItem.visible = true;
834
66
                } }
65
                } }
835
67
                UbuntuNumberAnimation {
66
                UbuntuNumberAnimation {
837
68
                    target: root.surfaceItem; property: "y"; to: 0
67
                    target: root.surfaceItem; property: "anchors.topMargin"; from: root.container.height; to: 0
838
69
                    duration: UbuntuAnimation.BriskDuration
68
                    duration: UbuntuAnimation.BriskDuration
839
70
                }
69
                }
840
71
                PropertyAction { target: container.parent; property: "clip"; value: false }
70
                PropertyAction { target: container.parent; property: "clip"; value: false }
841
72
71
842
=== added directory 'qml/Stage/Spread'
843
=== added file 'qml/Stage/Spread/BezierCurve.qml'
844
--- qml/Stage/Spread/BezierCurve.qml	1970-01-01 00:00:00 +0000
845
+++ qml/Stage/Spread/BezierCurve.qml	2016-10-11 21:49:13 +0000
846
@@ -0,0 +1,45 @@
847
1
/*
848
2
 * Copyright (C) 2016 Canonical, Ltd.
849
3
 *
850
4
 * This program is free software; you can redistribute it and/or modify
851
5
 * it under the terms of the GNU General Public License as published by
852
6
 * the Free Software Foundation; version 3.
853
7
 *
854
8
 * This program is distributed in the hope that it will be useful,
855
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
856
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
857
11
 * GNU General Public License for more details.
858
12
 *
859
13
 * You should have received a copy of the GNU General Public License
860
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
861
15
 */
862
16
863
17
import QtQuick 2.4
864
18
import Ubuntu.Components 1.3
865
19
import QtQuick.Window 2.2
866
20
import 'cubic-bezier.js' as Bezier
867
21
import 'KeySpline.js' as KeySpline
868
22
869
23
Item {
870
24
    id: root
871
25
872
26
    property var controlPoint1: {'x':0, 'y':0}
873
27
    property var controlPoint2: {'x':0, 'y':0}
874
28
    property var controlPoint3: {'x':0.58, 'y':1}
875
29
    property var controlPoint4: {'x':1, 'y':1}
876
30
877
31
    function getValues(t) {
878
32
        if (t<0) t=0
879
33
        else if (t>1)t=1
880
34
881
35
        return Bezier.getBezier(t, controlPoint1, controlPoint2, controlPoint3, controlPoint4)
882
36
    }
883
37
884
38
    function getYFromX(x) {
885
39
        var spline = new KeySpline.keySpline(controlPoint2.x, controlPoint2.y, controlPoint3.x, controlPoint3.y)
886
40
        if (x<0) x=0
887
41
        else if (x>1)x=1
888
42
889
43
        return spline.get(x)
890
44
    }
891
45
}
892
0
46
893
=== added file 'qml/Stage/Spread/KeySpline.js'
894
--- qml/Stage/Spread/KeySpline.js	1970-01-01 00:00:00 +0000
895
+++ qml/Stage/Spread/KeySpline.js	2016-10-11 21:49:13 +0000
896
@@ -0,0 +1,66 @@
897
1
/** MIT License
898
2
 *
899
3
 * KeySpline - use bezier curve for transition easing function
900
4
 * Copyright (c) 2012 Gaetan Renaudeau <renaudeau.gaetan@gmail.com>
901
5
 *
902
6
 * Permission is hereby granted, free of charge, to any person obtaining a
903
7
 * copy of this software and associated documentation files (the "Software"),
904
8
 * to deal in the Software without restriction, including without limitation
905
9
 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
906
10
 * and/or sell copies of the Software, and to permit persons to whom the
907
11
 * Software is furnished to do so, subject to the following conditions:
908
12
 *
909
13
 * The above copyright notice and this permission notice shall be included in
910
14
 * all copies or substantial portions of the Software.
911
15
 *
912
16
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
913
17
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
914
18
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
915
19
 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
916
20
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
917
21
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
918
22
 * DEALINGS IN THE SOFTWARE.
919
23
 */
920
24
/**
921
25
* KeySpline - use bezier curve for transition easing function
922
26
* is inspired from Firefox's nsSMILKeySpline.cpp
923
27
* Usage:
924
28
* var spline = new KeySpline(0.25, 0.1, 0.25, 1.0)
925
29
* spline.get(x) => returns the easing value | x must be in [0, 1] range
926
30
*/
927
31
928
32
.pragma library
929
33
930
34
function keySpline (mX1, mY1, mX2, mY2) {
931
35
932
36
  this.get = function(aX) {
933
37
    if (mX1 == mY1 && mX2 == mY2) return aX; // linear
934
38
    return CalcBezier(GetTForX(aX), mY1, mY2);
935
39
  }
936
40
937
41
  function A(aA1, aA2) { return 1.0 - 3.0 * aA2 + 3.0 * aA1; }
938
42
  function B(aA1, aA2) { return 3.0 * aA2 - 6.0 * aA1; }
939
43
  function C(aA1)      { return 3.0 * aA1; }
940
44
941
45
  // Returns x(t) given t, x1, and x2, or y(t) given t, y1, and y2.
942
46
  function CalcBezier(aT, aA1, aA2) {
943
47
    return ((A(aA1, aA2)*aT + B(aA1, aA2))*aT + C(aA1))*aT;
944
48
  }
945
49
946
50
  // Returns dx/dt given t, x1, and x2, or dy/dt given t, y1, and y2.
947
51
  function GetSlope(aT, aA1, aA2) {
948
52
    return 3.0 * A(aA1, aA2)*aT*aT + 2.0 * B(aA1, aA2) * aT + C(aA1);
949
53
  }
950
54
951
55
  function GetTForX(aX) {
952
56
    // Newton raphson iteration
953
57
    var aGuessT = aX;
954
58
    for (var i = 0; i < 4; ++i) {
955
59
      var currentSlope = GetSlope(aGuessT, mX1, mX2);
956
60
      if (currentSlope == 0.0) return aGuessT;
957
61
      var currentX = CalcBezier(aGuessT, mX1, mX2) - aX;
958
62
      aGuessT -= currentX / currentSlope;
959
63
    }
960
64
    return aGuessT;
961
65
  }
962
66
}
963
0
67
964
=== added file 'qml/Stage/Spread/MathUtils.js'
965
--- qml/Stage/Spread/MathUtils.js	1970-01-01 00:00:00 +0000
966
+++ qml/Stage/Spread/MathUtils.js	2016-10-11 21:49:13 +0000
967
@@ -0,0 +1,95 @@
968
1
/*
969
2
 * Copyright (C) 2016 Canonical, Ltd.
970
3
 *
971
4
 * This program is free software; you can redistribute it and/or modify
972
5
 * it under the terms of the GNU General Public License as published by
973
6
 * the Free Software Foundation; version 3.
974
7
 *
975
8
 * This program is distributed in the hope that it will be useful,
976
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
977
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
978
11
 * GNU General Public License for more details.
979
12
 *
980
13
 * You should have received a copy of the GNU General Public License
981
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
982
15
 */
983
16
984
17
.pragma library
985
18
986
19
/**
987
20
 * From processing.js: https://raw.githubusercontent.com/processing-js/processing-js/v1.4.8/processing.js
988
21
 *
989
22
 * Re-map a number from one range to another. In the example above, the number
990
23
 * '25' is converted from a value in the range 0..100 into a value that
991
24
 * ranges from the left edge (0) to the right edge (width) of the screen.
992
25
 * Numbers outside the range are not clamped to 0 and 1, because out-of-range
993
26
 * values are often intentional and useful.
994
27
 *
995
28
 * @param {Number} value        The incoming value to be converted
996
29
 * @param {Number} istart       Lower bound of the value's current range
997
30
 * @param {Number} istop        Upper bound of the value's current range
998
31
 * @param {Number} ostart       Lower bound of the value's target range
999
32
 * @param {Number} ostop        Upper bound of the value's target range
1000
33
 *
1001
34
 * @returns {Number}
1002
35
 */
1003
36
function map(value, istart, istop, ostart, ostop) {
1004
37
  return ostart + (ostop - ostart) * ((value - istart) / (istop - istart))
1005
38
}
1006
39
1007
40
/**
1008
41
 * Return a value which is always between `min` and `max`
1009
42
 *
1010
43
 * @param {Number} value     The current value
1011
44
 * @param {Number} min       The minimum value
1012
45
 * @param {Number} max       The maximum value
1013
46
 *
1014
47
 * @returns {Number}
1015
48
 */
1016
49
function clamp(value, min, max) {
1017
50
  if (value < min) return min
1018
51
  if (value > max) return max
1019
52
  return value
1020
53
}
1021
54
1022
55
// calculates the distance from the middle of one rect to middle of other rect
1023
56
function rectDistance(rect1, rect2) {
1024
57
    return pointDistance(Qt.point(rect1.x + rect1.width / 2, rect1.y + rect1.height / 2),
1025
58
                         Qt.point(rect2.x + rect2.width / 2, rect2.y + rect2.height / 2))
1026
59
}
1027
60
1028
61
// calculates the distance between two points
1029
62
function pointDistance(point1, point2) {
1030
63
    return Math.sqrt(Math.pow(point1.x - point2.x, 2) +
1031
64
                     Math.pow(point1.y - point2.y, 2)
1032
65
                    )
1033
66
}
1034
67
1035
68
// from http://stackoverflow.com/questions/14616829/java-method-to-find-the-rectangle-that-is-the-intersection-of-two-rectangles-usi
1036
69
function intersectionRect(r1, r2) {
1037
70
    var xmin = Math.max(r1.x, r2.x);
1038
71
    var xmax1 = r1.x + r1.width;
1039
72
    var xmax2 = r2.x + r2.width;
1040
73
    var xmax = Math.min(xmax1, xmax2);
1041
74
    var out = {x:0, y:0, width:0, height:0}
1042
75
    if (xmax > xmin) {
1043
76
        var ymin = Math.max(r1.y, r2.y);
1044
77
        var ymax1 = r1.y + r1.height;
1045
78
        var ymax2 = r2.y + r2.height;
1046
79
        var ymax = Math.min(ymax1, ymax2);
1047
80
        if (ymax > ymin) {
1048
81
            out.x = xmin;
1049
82
            out.y = ymin;
1050
83
            out.width = xmax - xmin;
1051
84
            out.height = ymax - ymin;
1052
85
        }
1053
86
    }
1054
87
    return out;
1055
88
}
1056
89
1057
90
function easeOutCubic(t) { return (--t)*t*t+1 }
1058
91
1059
92
function linearAnimation(startProgress, endProgress, startValue, endValue, progress) {
1060
93
    // progress : progressDiff = value : valueDiff => value = progress * valueDiff / progressDiff
1061
94
    return (progress - startProgress) * (endValue - startValue) / (endProgress - startProgress) + startValue;
1062
95
}
1063
0
96
1064
=== added file 'qml/Stage/Spread/OpacityMask.qml'
1065
--- qml/Stage/Spread/OpacityMask.qml	1970-01-01 00:00:00 +0000
1066
+++ qml/Stage/Spread/OpacityMask.qml	2016-10-11 21:49:13 +0000
1067
@@ -0,0 +1,82 @@
1068
1
/*
1069
2
 * Copyright (C) 2016 Canonical, Ltd.
1070
3
 *
1071
4
 * This program is free software; you can redistribute it and/or modify
1072
5
 * it under the terms of the GNU General Public License as published by
1073
6
 * the Free Software Foundation; version 3.
1074
7
 *
1075
8
 * This program is distributed in the hope that it will be useful,
1076
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1077
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1078
11
 * GNU General Public License for more details.
1079
12
 *
1080
13
 * You should have received a copy of the GNU General Public License
1081
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1082
15
 */
1083
16
1084
17
import QtQuick 2.4
1085
18
1086
19
Item {
1087
20
    id: root
1088
21
    anchors.fill: sourceItem
1089
22
    anchors.margins: -units.gu(2)
1090
23
    visible: sourceItem !== null
1091
24
1092
25
    property var sourceItem: null
1093
26
    property int maskX: 0
1094
27
    property int maskY: 0
1095
28
    property int maskWidth: 0
1096
29
    property int maskHeight: 0
1097
30
1098
31
    property real opacityValue: 1
1099
32
1100
33
    Item {
1101
34
        id: opacityMask
1102
35
        anchors.fill: parent
1103
36
1104
37
        Rectangle {
1105
38
            id: clipRect
1106
39
            color: "black"
1107
40
            x: root.maskX - root.anchors.margins
1108
41
            y: root.maskY - root.anchors.margins
1109
42
            width: root.maskWidth
1110
43
            height: root.maskHeight
1111
44
            opacity: 1 - root.opacityValue
1112
45
        }
1113
46
    }
1114
47
1115
48
    ShaderEffect {
1116
49
        id: opacityEffect
1117
50
        anchors.fill: parent
1118
51
1119
52
        property variant source: ShaderEffectSource {
1120
53
            id: shaderEffectSource
1121
54
            sourceItem: root.sourceItem
1122
55
            sourceRect: root.sourceItem ? Qt.rect(sourceItem.x + root.anchors.margins,
1123
56
                                                sourceItem.y + root.anchors.margins,
1124
57
                                                sourceItem.width - root.anchors.margins * 2,
1125
58
                                                sourceItem.height - root.anchors.margins * 2)
1126
59
                                        : Qt.rect(0,0,0,0)
1127
60
            hideSource: true
1128
61
        }
1129
62
1130
63
        property var mask: ShaderEffectSource {
1131
64
            sourceItem: opacityMask
1132
65
            hideSource: true
1133
66
        }
1134
67
1135
68
        fragmentShader: "
1136
69
            varying highp vec2 qt_TexCoord0;
1137
70
            uniform sampler2D source;
1138
71
            uniform sampler2D mask;
1139
72
            void main(void)
1140
73
            {
1141
74
                highp vec4 sourceColor = texture2D(source, qt_TexCoord0);
1142
75
                highp vec4 maskColor = texture2D(mask, qt_TexCoord0);
1143
76
1144
77
                sourceColor *= 1.0 - maskColor.a;
1145
78
1146
79
                gl_FragColor = sourceColor;
1147
80
            }"
1148
81
    }
1149
82
}
1150
0
83
1151
=== added file 'qml/Stage/Spread/Spread.qml'
1152
--- qml/Stage/Spread/Spread.qml	1970-01-01 00:00:00 +0000
1153
+++ qml/Stage/Spread/Spread.qml	2016-10-11 21:49:13 +0000
1154
@@ -0,0 +1,162 @@
1155
1
/*
1156
2
 * Copyright (C) 2016 Canonical, Ltd.
1157
3
 *
1158
4
 * This program is free software; you can redistribute it and/or modify
1159
5
 * it under the terms of the GNU General Public License as published by
1160
6
 * the Free Software Foundation; version 3.
1161
7
 *
1162
8
 * This program is distributed in the hope that it will be useful,
1163
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1164
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1165
11
 * GNU General Public License for more details.
1166
12
 *
1167
13
 * You should have received a copy of the GNU General Public License
1168
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1169
15
 */
1170
16
1171
17
import QtQuick 2.4
1172
18
import Ubuntu.Components 1.3
1173
19
import "MathUtils.js" as MathUtils
1174
20
1175
21
Item {
1176
22
    id: root
1177
23
1178
24
    // Information about the environment
1179
25
    property int highlightedIndex: -1
1180
26
    property var model: null
1181
27
    property int leftMargin: 0
1182
28
    property var spreadFlickable
1183
29
1184
30
    // some config options
1185
31
    property real contentMargin: 0.16 * root.height
1186
32
    property real contentTopMargin: contentMargin
1187
33
    property real contentBottomMargin: 0.35 * contentMargin
1188
34
    property real windowTitleTopMargin: 3/4 * (contentTopMargin - windowTitle.height)
1189
35
    property int stackItemCount: 3
1190
36
    property real leftRotationAngle: 22
1191
37
    property real rightRotationAngle: 32
1192
38
    property real leftStackScale: .82
1193
39
    property real rightStackScale: 1
1194
40
    property real rightEdgeBreakPoint: Math.min(units.gu(40) / root.width, .35)
1195
41
1196
42
    signal leaveSpread()
1197
43
1198
44
    // Calculated stuff
1199
45
    readonly property int totalItemCount: model.count
1200
46
    readonly property real leftStackXPos: 0.03 * root.width + leftMargin
1201
47
    readonly property real rightStackXPos: root.width - 1.5 * leftStackXPos + leftMargin
1202
48
1203
49
    readonly property real stackHeight: spreadItemHeight - appInfoHeight
1204
50
    readonly property real stackWidth: Math.min(leftStackXPos/3, units.gu(1.5))
1205
51
1206
52
    readonly property real spreadWidth: rightStackXPos - leftStackXPos
1207
53
    readonly property real spreadHeight: root.height
1208
54
    readonly property real spreadItemHeight: spreadHeight - contentTopMargin - contentBottomMargin
1209
55
    readonly property real spreadItemWidth: stackHeight
1210
56
1211
57
    readonly property real dynamicLeftRotationAngle: leftRotationAngle * rotationAngleFactor
1212
58
    readonly property real dynamicRightRotationAngle: rightRotationAngle * rotationAngleFactor
1213
59
1214
60
    readonly property real appInfoHeight: {
1215
61
        var screenHeightReferencePoint = 40 // ref screen height in gu
1216
62
        var valueAtReferencePoint = 0.17 // of screen height at the reference point
1217
63
        var appInfoHeightValueChange = -0.0014 // units / gu
1218
64
        var minAppInfoHeight = 0.08
1219
65
        var maxAppInfoHeight = 0.2
1220
66
        var screenHeightInGU = root.height / units.gu(1) // screenHeight in gu
1221
67
1222
68
        return MathUtils.clamp(valueAtReferencePoint + appInfoHeightValueChange * (screenHeightInGU - screenHeightReferencePoint), minAppInfoHeight, maxAppInfoHeight) * root.height
1223
69
    }
1224
70
1225
71
    property real rotationAngleFactor: {
1226
72
        var spreadHeightReferencePoint = 28 // reference spread height in gu
1227
73
        var valueAtReferencePoint = 1.3
1228
74
        var rotationAngleValueChange = -0.008 // units / gu
1229
75
        var minRotationAngleFactor = 0.6
1230
76
        var maxRotationAngleFactor = 1.5
1231
77
        var spreadHeightInGU = spreadHeight / units.gu(1)
1232
78
1233
79
        return MathUtils.clamp(valueAtReferencePoint + rotationAngleValueChange * (spreadHeightInGU - spreadHeightReferencePoint), minRotationAngleFactor, maxRotationAngleFactor)
1234
80
    }
1235
81
    readonly property real itemOverlap: {
1236
82
        var spreadAspectRatioReferencePoint = 1.0 // ref screen height in gu
1237
83
        var valueAtReferencePoint = 0.74 // of screen height at the reference point
1238
84
        var itemOverlapValueChange = -0.068
1239
85
        var minOverlap = 0.55
1240
86
        var maxOverlap = 0.82
1241
87
        var spreadAspectRatio = spreadWidth / stackHeight // spread stack aspect ratio (app info not included)
1242
88
1243
89
        return MathUtils.clamp(valueAtReferencePoint + itemOverlapValueChange * (spreadAspectRatio - spreadAspectRatioReferencePoint), minOverlap, maxOverlap)
1244
90
    }
1245
91
1246
92
    readonly property real visibleItemCount: (spreadWidth / spreadItemWidth) / (1 - itemOverlap)
1247
93
1248
94
    readonly property real spreadTotalWidth: totalItemCount * spreadWidth / visibleItemCount
1249
95
1250
96
    readonly property real centeringOffset: Math.max(spreadWidth - spreadTotalWidth ,0) / (2 * spreadWidth)
1251
97
1252
98
1253
99
    readonly property var curve: BezierCurve {
1254
100
        controlPoint2: {'x': 0.19, 'y': 0.00}
1255
101
        controlPoint3: {'x': 0.91, 'y': 1.00}
1256
102
    }
1257
103
1258
104
    Label {
1259
105
        id: windowTitle
1260
106
1261
107
        width: Math.min(implicitWidth, 0.5*root.width)
1262
108
        elide: Qt.ElideMiddle
1263
109
        anchors.horizontalCenter: parent.horizontalCenter
1264
110
        y: windowTitleTopMargin
1265
111
        readonly property var highlightedSurface: root.model ? root.model.surfaceAt(root.highlightedIndex) : null
1266
112
        readonly property var highlightedApp: root.model ? root.model.applicationAt(root.highlightedIndex) : null
1267
113
        text: root.highlightedIndex >= 0 && highlightedSurface && highlightedSurface.name != "" ? highlightedSurface.name :
1268
114
                                                                                                  highlightedApp ? highlightedApp.name : ""
1269
115
        fontSize: root.height < units.gu(85) ? 'medium' : 'large'
1270
116
        color: "white"
1271
117
        opacity: root.highlightedIndex >= 0 ? 1 : 0
1272
118
        Behavior on opacity { UbuntuNumberAnimation { } }
1273
119
    }
1274
120
1275
121
    Keys.onPressed: {
1276
122
        switch (event.key) {
1277
123
        case Qt.Key_Left:
1278
124
        case Qt.Key_Backtab:
1279
125
            selectPrevious(event.isAutoRepeat)
1280
126
            event.accepted = true;
1281
127
            break;
1282
128
        case Qt.Key_Right:
1283
129
        case Qt.Key_Tab:
1284
130
            selectNext(event.isAutoRepeat)
1285
131
            event.accepted = true;
1286
132
            break;
1287
133
        case Qt.Key_Escape:
1288
134
            highlightedIndex = -1
1289
135
            // Falling through intentionally
1290
136
        case Qt.Key_Enter:
1291
137
        case Qt.Key_Return:
1292
138
        case Qt.Key_Space:
1293
139
            root.leaveSpread();
1294
140
            event.accepted = true;
1295
141
        }
1296
142
    }
1297
143
1298
144
1299
145
    function selectNext(isAutoRepeat) {
1300
146
        if (isAutoRepeat && highlightedIndex >= totalItemCount -1) {
1301
147
            return; // AutoRepeat is not allowed to wrap around
1302
148
        }
1303
149
1304
150
        highlightedIndex = (highlightedIndex + 1) % totalItemCount;
1305
151
        spreadFlickable.snap(highlightedIndex)
1306
152
    }
1307
153
1308
154
    function selectPrevious(isAutoRepeat) {
1309
155
        if (isAutoRepeat && highlightedIndex == 0) {
1310
156
            return; // AutoRepeat is not allowed to wrap around
1311
157
        }
1312
158
1313
159
        highlightedIndex = highlightedIndex - 1 >= 0 ? highlightedIndex - 1 : totalItemCount - 1;
1314
160
        spreadFlickable.snap(highlightedIndex)
1315
161
    }
1316
162
}
1317
0
163
1318
=== added file 'qml/Stage/Spread/SpreadDelegateInputArea.qml'
1319
--- qml/Stage/Spread/SpreadDelegateInputArea.qml	1970-01-01 00:00:00 +0000
1320
+++ qml/Stage/Spread/SpreadDelegateInputArea.qml	2016-10-11 21:49:13 +0000
1321
@@ -0,0 +1,183 @@
1322
1
/*
1323
2
 * Copyright (C) 2016 Canonical, Ltd.
1324
3
 *
1325
4
 * This program is free software; you can redistribute it and/or modify
1326
5
 * it under the terms of the GNU General Public License as published by
1327
6
 * the Free Software Foundation; version 3.
1328
7
 *
1329
8
 * This program is distributed in the hope that it will be useful,
1330
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1331
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1332
11
 * GNU General Public License for more details.
1333
12
 *
1334
13
 * You should have received a copy of the GNU General Public License
1335
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1336
15
 */
1337
16
1338
17
import QtQuick 2.4
1339
18
import Ubuntu.Components 1.3
1340
19
import Ubuntu.Gestures 0.1
1341
20
import "../../Components"
1342
21
1343
22
Item {
1344
23
    id: root
1345
24
1346
25
    property bool closeable: true
1347
26
    readonly property real minSpeedToClose: units.gu(40)
1348
27
    property bool zeroVelocityCounts: false
1349
28
1350
29
    readonly property alias distance: d.distance
1351
30
1352
31
    signal clicked()
1353
32
    signal close()
1354
33
1355
34
    QtObject {
1356
35
        id: d
1357
36
        property real distance: 0
1358
37
        property bool moving: false
1359
38
        property var dragEvents: []
1360
39
        property real dragVelocity: 0
1361
40
        property int threshold: units.gu(2)
1362
41
1363
42
        // Can be replaced with a fake implementation during tests
1364
43
        // property var __getCurrentTimeMs: function () { return new Date().getTime() }
1365
44
        property var __dateTime: new function() {
1366
45
            this.getCurrentTimeMs = function() {return new Date().getTime()}
1367
46
        }
1368
47
1369
48
        function pushDragEvent(event) {
1370
49
            var currentTime = __dateTime.getCurrentTimeMs()
1371
50
            dragEvents.push([currentTime, event.x - event.startX, event.y - event.startY, getEventSpeed(currentTime, event)])
1372
51
            cullOldDragEvents(currentTime)
1373
52
            updateSpeed()
1374
53
        }
1375
54
1376
55
        function cullOldDragEvents(currentTime) {
1377
56
            // cull events older than 50 ms but always keep the latest 2 events
1378
57
            for (var numberOfCulledEvents = 0; numberOfCulledEvents < dragEvents.length-2; numberOfCulledEvents++) {
1379
58
                // dragEvents[numberOfCulledEvents][0] is the dragTime
1380
59
                if (currentTime - dragEvents[numberOfCulledEvents][0] <= 50) break
1381
60
            }
1382
61
1383
62
            dragEvents.splice(0, numberOfCulledEvents)
1384
63
        }
1385
64
1386
65
        function updateSpeed() {
1387
66
            var totalSpeed = 0
1388
67
            for (var i = 0; i < dragEvents.length; i++) {
1389
68
                totalSpeed += dragEvents[i][3]
1390
69
            }
1391
70
1392
71
            if (zeroVelocityCounts || Math.abs(totalSpeed) > 0.001) {
1393
72
                dragVelocity = totalSpeed / dragEvents.length * 1000
1394
73
            }
1395
74
        }
1396
75
1397
76
        function getEventSpeed(currentTime, event) {
1398
77
            if (dragEvents.length != 0) {
1399
78
                var lastDrag = dragEvents[dragEvents.length-1]
1400
79
                var duration = Math.max(1, currentTime - lastDrag[0])
1401
80
                return (event.y - event.startY - lastDrag[2]) / duration
1402
81
            } else {
1403
82
                return 0
1404
83
            }
1405
84
        }
1406
85
    }
1407
86
1408
87
    // Event eater
1409
88
    MouseArea {
1410
89
        anchors.fill: parent
1411
90
        onClicked: root.clicked()
1412
91
        onWheel: wheel.accepted = true
1413
92
    }
1414
93
1415
94
    MultiPointTouchArea {
1416
95
        anchors.fill: parent
1417
96
        mouseEnabled: false
1418
97
        maximumTouchPoints: 1
1419
98
        property int offset: 0
1420
99
1421
100
        touchPoints: [
1422
101
            TouchPoint {
1423
102
                id: tp
1424
103
            }
1425
104
        ]
1426
105
1427
106
        onCanceled: {
1428
107
            d.moving = false
1429
108
            animation.animate("center");
1430
109
        }
1431
110
1432
111
        onTouchUpdated: {
1433
112
            if (!d.moving) {
1434
113
                if (Math.abs(tp.startY - tp.y) > d.threshold) {
1435
114
                    d.moving = true;
1436
115
                    d.dragEvents = []
1437
116
                    offset = tp.y - tp.startY;
1438
117
                } else {
1439
118
                    return;
1440
119
                }
1441
120
            }
1442
121
1443
122
            d.distance = tp.y - tp.startY - offset
1444
123
            d.pushDragEvent(tp);
1445
124
        }
1446
125
1447
126
        onReleased: {
1448
127
            if (!d.moving) {
1449
128
                root.clicked()
1450
129
            }
1451
130
1452
131
            if (!root.closeable) {
1453
132
                animation.animate("center")
1454
133
                return;
1455
134
            }
1456
135
1457
136
            var touchPoint = touchPoints[0];
1458
137
1459
138
            if ((d.dragVelocity < -root.minSpeedToClose && d.distance < -units.gu(8)) || d.distance < -root.height / 2) {
1460
139
                animation.animate("up")
1461
140
            } else if ((d.dragVelocity > root.minSpeedToClose  && d.distance > units.gu(8)) || d.distance > root.height / 2) {
1462
141
                animation.animate("down")
1463
142
            } else {
1464
143
                animation.animate("center")
1465
144
            }
1466
145
        }
1467
146
    }
1468
147
1469
148
    UbuntuNumberAnimation {
1470
149
        id: animation
1471
150
        objectName: "closeAnimation"
1472
151
        target: d
1473
152
        property: "distance"
1474
153
        property bool requestClose: false
1475
154
1476
155
        function animate(direction) {
1477
156
            animation.from = dragArea.distance;
1478
157
            switch (direction) {
1479
158
            case "up":
1480
159
                animation.to = -root.height * 1.5;
1481
160
                requestClose = true;
1482
161
                break;
1483
162
            case "down":
1484
163
                animation.to = root.height * 1.5;
1485
164
                requestClose = true;
1486
165
                break;
1487
166
            default:
1488
167
                animation.to = 0
1489
168
            }
1490
169
            animation.start();
1491
170
        }
1492
171
1493
172
        onRunningChanged: {
1494
173
            if (!running) {
1495
174
                d.moving = false;
1496
175
                if (requestClose) {
1497
176
                    root.close();
1498
177
                } else {
1499
178
                    d.distance = 0;
1500
179
                }
1501
180
            }
1502
181
        }
1503
182
    }
1504
183
}
1505
0
184
1506
=== added file 'qml/Stage/Spread/SpreadMaths.qml'
1507
--- qml/Stage/Spread/SpreadMaths.qml	1970-01-01 00:00:00 +0000
1508
+++ qml/Stage/Spread/SpreadMaths.qml	2016-10-11 21:49:13 +0000
1509
@@ -0,0 +1,78 @@
1510
1
/*
1511
2
 * Copyright (C) 2016 Canonical, Ltd.
1512
3
 *
1513
4
 * This program is free software; you can redistribute it and/or modify
1514
5
 * it under the terms of the GNU General Public License as published by
1515
6
 * the Free Software Foundation; version 3.
1516
7
 *
1517
8
 * This program is distributed in the hope that it will be useful,
1518
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1519
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1520
11
 * GNU General Public License for more details.
1521
12
 *
1522
13
 * You should have received a copy of the GNU General Public License
1523
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1524
15
 */
1525
16
1526
17
import QtQuick 2.4
1527
18
import Ubuntu.Components 1.3
1528
19
import Utils 0.1
1529
20
import "MathUtils.js" as MathUtils
1530
21
1531
22
Item {
1532
23
    id: root
1533
24
    anchors { left: parent.left; top: parent.top; margins: units.gu(1) }
1534
25
1535
26
    // Information about the environment
1536
27
    property Item flickable: null
1537
28
    property Spread spread: null
1538
29
    property int itemIndex: 0
1539
30
1540
31
    // Internal
1541
32
    property real spreadPosition: itemIndex/spread.visibleItemCount - flickable.contentX/spread.spreadWidth // 0 -> left stack, 1 -> right stack
1542
33
    property real leftStackingProgress: MathUtils.clamp(MathUtils.map(spreadPosition, 0, -spread.stackItemCount/spread.visibleItemCount  , 0, 1), 0, 1)
1543
34
    property real rightStackingProgress: MathUtils.clamp(MathUtils.map(spreadPosition, 1, 1 + spread.stackItemCount/spread.visibleItemCount  , 0, 1), 0, 1)
1544
35
    property real stackingX: (MathUtils.easeOutCubic(rightStackingProgress) - MathUtils.easeOutCubic(leftStackingProgress)) * spread.stackWidth
1545
36
1546
37
1547
38
    QtObject {
1548
39
        id: d
1549
40
        property real spreadScale: MathUtils.clamp(
1550
41
                                       MathUtils.map(spreadPosition, 0, 1, spread.leftStackScale, spread.rightStackScale),
1551
42
                                                 spread.leftStackScale, spread.rightStackScale)
1552
43
1553
44
        property real selectedScale: (spread.highlightedIndex == itemIndex ? 1.01 : 1)
1554
45
        Behavior on selectedScale { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
1555
46
1556
47
    }
1557
48
1558
49
    // Output
1559
50
    readonly property int targetX: spread.leftStackXPos +
1560
51
                                     spread.spreadWidth * spread.curve.getYFromX(spreadPosition + spread.centeringOffset) +
1561
52
                                     stackingX
1562
53
1563
54
    readonly property int targetY: spread.contentTopMargin
1564
55
1565
56
    readonly property real targetAngle: MathUtils.clamp(
1566
57
                            MathUtils.map(targetX, spread.leftStackXPos, spread.rightStackXPos, spread.dynamicLeftRotationAngle, spread.dynamicRightRotationAngle),
1567
58
                            Math.min(spread.dynamicLeftRotationAngle, spread.dynamicRightRotationAngle), Math.max(spread.dynamicLeftRotationAngle, spread.dynamicRightRotationAngle))
1568
59
1569
60
1570
61
    readonly property real targetScale: d.spreadScale * d.selectedScale
1571
62
1572
63
    readonly property real shadowOpacity: 0.2 * (1  - rightStackingProgress) * (1 - leftStackingProgress)
1573
64
1574
65
1575
66
    readonly property real closeIconOffset: (targetScale - 1) * (-spread.stackHeight / 2)
1576
67
1577
68
    readonly property real tileInfoOpacity: Math.min(MathUtils.clamp(MathUtils.map(leftStackingProgress, 0 , 1/(spread.stackItemCount*3), 1, 0), 0 , 1),
1578
69
                                                     MathUtils.clamp(MathUtils.map(spreadPosition, 0.9 , 1, 1, 0), 0 , 1)) /** MathUtils.map(curvedSwitcherProgress, 0.7, 0.9, 0, 1)*/
1579
70
1580
71
    readonly property bool itemVisible: {
1581
72
        var leftStackHidden = spreadPosition < -(spread.stackItemCount + 1)/spread.visibleItemCount
1582
73
        // don't hide the rightmost
1583
74
        var rightStackHidden = (spreadPosition > 1 + (spread.stackItemCount)/spread.visibleItemCount) && itemIndex !== spread.totalItemCount - 1
1584
75
        return !leftStackHidden && !rightStackHidden
1585
76
    }
1586
77
1587
78
}
1588
0
79
1589
=== added file 'qml/Stage/Spread/StagedRightEdgeMaths.qml'
1590
--- qml/Stage/Spread/StagedRightEdgeMaths.qml	1970-01-01 00:00:00 +0000
1591
+++ qml/Stage/Spread/StagedRightEdgeMaths.qml	2016-10-11 21:49:13 +0000
1592
@@ -0,0 +1,174 @@
1593
1
/*
1594
2
 * Copyright (C) 2016 Canonical, Ltd.
1595
3
 *
1596
4
 * This program is free software; you can redistribute it and/or modify
1597
5
 * it under the terms of the GNU General Public License as published by
1598
6
 * the Free Software Foundation; version 3.
1599
7
 *
1600
8
 * This program is distributed in the hope that it will be useful,
1601
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1602
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1603
11
 * GNU General Public License for more details.
1604
12
 *
1605
13
 * You should have received a copy of the GNU General Public License
1606
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1607
15
 */
1608
16
1609
17
import QtQuick 2.4
1610
18
import Ubuntu.Components 1.3
1611
19
import Unity.Application 0.1
1612
20
import "MathUtils.js" as MathUtils
1613
21
1614
22
QtObject {
1615
23
    id: root
1616
24
1617
25
    // Input
1618
26
    property int itemIndex: 0
1619
27
    property real progress: 0
1620
28
    property int sceneWidth: 0
1621
29
    property int sideStageWidth: 0
1622
30
    property int sceneHeight: 0
1623
31
    property int targetX: 0
1624
32
    property int startY: 0
1625
33
    property int targetY: 0
1626
34
    property real startAngle: 30
1627
35
    property real targetAngle: 0
1628
36
    property int targetHeight: 0
1629
37
    property real startScale: 1.3
1630
38
    property real targetScale: 0
1631
39
    property real breakPoint: units.gu(15) / sceneWidth
1632
40
1633
41
    property bool isMainStageApp: false
1634
42
    property bool isSideStageApp: false
1635
43
    property bool sideStageOpen: false
1636
44
    property int nextInStack: 0
1637
45
    property int shuffledZ: 0
1638
46
1639
47
1640
48
    // Config
1641
49
    property int tileDistance: units.gu(10)
1642
50
1643
51
    // Output
1644
52
1645
53
    readonly property real scaleToPreviewProgress: {
1646
54
        return progress < breakPoint ? 0 : MathUtils.clamp(MathUtils.linearAnimation(breakPoint, 1, 0, 1, progress), 0, 1)
1647
55
    }
1648
56
    readonly property int animatedWidth: {
1649
57
        return progress < breakPoint ? root.sceneHeight : MathUtils.linearAnimation(breakPoint, 1, root.sceneWidth, targetHeight, progress)
1650
58
    }
1651
59
1652
60
    readonly property int animatedHeight: {
1653
61
        return progress < breakPoint ? root.sceneHeight : MathUtils.linearAnimation(breakPoint, 1, root.sceneHeight, targetHeight, progress)
1654
62
    }
1655
63
1656
64
1657
65
    readonly property int animatedX: {
1658
66
        var nextStage = appRepeater.itemAt(nextInStack) ? appRepeater.itemAt(nextInStack).stage : ApplicationInfoInterface.MainStage;
1659
67
1660
68
        var startX = 0;
1661
69
        if (isMainStageApp) {
1662
70
            if (progress < breakPoint) {
1663
71
                if (nextStage == ApplicationInfoInterface.MainStage) {
1664
72
                    return MathUtils.linearAnimation(0, breakPoint, 0, -units.gu(4), progress);
1665
73
                } else {
1666
74
                    return 0;
1667
75
                }
1668
76
            } else {
1669
77
                if (nextStage == ApplicationInfoInterface.MainStage) {
1670
78
                    return MathUtils.linearAnimation(breakPoint, 1, -units.gu(4), targetX, progress);
1671
79
                } else {
1672
80
                    return MathUtils.linearAnimation(breakPoint, 1, 0, targetX, progress);
1673
81
                }
1674
82
            }
1675
83
        } else if (isSideStageApp) {
1676
84
            startX = sceneWidth - sideStageWidth;
1677
85
        } else if (itemIndex == nextInStack && itemIndex <= 2 && priv.sideStageDelegate && nextStage == ApplicationInfoInterface.MainStage) {
1678
86
            startX = sceneWidth - sideStageWidth;
1679
87
        } else {
1680
88
            var stageCount = (priv.mainStageDelegate ? 1 : 0) + (priv.sideStageDelegate ? 1 : 0)
1681
89
            startX = sceneWidth + Math.max(0, itemIndex - stageCount - 1) * tileDistance;
1682
90
        }
1683
91
1684
92
        if (itemIndex == nextInStack) {
1685
93
            if (progress < breakPoint) {
1686
94
                return MathUtils.linearAnimation(0, breakPoint, startX, startX * (1 - breakPoint), progress)
1687
95
            }
1688
96
            return MathUtils.linearAnimation(breakPoint, 1, startX * (1 - breakPoint), targetX, progress)
1689
97
        }
1690
98
1691
99
        if (progress < breakPoint) {
1692
100
            return startX;
1693
101
        }
1694
102
1695
103
        return MathUtils.linearAnimation(breakPoint, 1, startX, targetX, progress)
1696
104
1697
105
    }
1698
106
1699
107
    readonly property int animatedY: progress < breakPoint ? startY : MathUtils.linearAnimation(breakPoint, 1, startY, targetY, progress)
1700
108
1701
109
    readonly property int animatedZ: {
1702
110
        if (progress < breakPoint + (1 - breakPoint) / 2) {
1703
111
            return shuffledZ
1704
112
        }
1705
113
        return itemIndex;
1706
114
    }
1707
115
1708
116
    readonly property real animatedAngle: {
1709
117
        var nextStage = appRepeater.itemAt(nextInStack) ? appRepeater.itemAt(nextInStack).stage : ApplicationInfoInterface.MainStage;
1710
118
1711
119
        var startAngle = 0;
1712
120
        if (isMainStageApp) {
1713
121
            startAngle = 0;
1714
122
        } else if (isSideStageApp) {
1715
123
            startAngle = 0;
1716
124
        } else {
1717
125
            if (stage == ApplicationInfoInterface.SideStage && itemIndex == nextInStack && !sideStageOpen) {
1718
126
                startAngle = 0;
1719
127
            } else {
1720
128
                startAngle = root.startAngle;
1721
129
            }
1722
130
        }
1723
131
1724
132
        if ((itemIndex == nextInStack)
1725
133
                || (isMainStageApp && nextStage === ApplicationInfoInterface.MainStage)
1726
134
                || (isSideStageApp && nextStage === ApplicationInfoInterface.SideStage)) {
1727
135
            return MathUtils.linearAnimation(0, 1, startAngle, targetAngle, progress);
1728
136
        }
1729
137
1730
138
        if (progress < breakPoint) {
1731
139
            return 0;
1732
140
        }
1733
141
        return MathUtils.linearAnimation(breakPoint, 1, startAngle, targetAngle, progress);
1734
142
    }
1735
143
1736
144
    readonly property real animatedScale: {
1737
145
        var pullingInSideStage = itemIndex == nextInStack && stage == ApplicationInfoInterface.SideStage && !sideStageOpen;
1738
146
1739
147
        var startScale = 1;
1740
148
        if (isMainStageApp) {
1741
149
            startScale = 1;
1742
150
        } else if (isSideStageApp) {
1743
151
            startScale = 1;
1744
152
        } else {
1745
153
            if (pullingInSideStage) {
1746
154
                startScale = 1
1747
155
            } else {
1748
156
                startScale = root.startScale;
1749
157
            }
1750
158
        }
1751
159
1752
160
        if (progress < breakPoint) {
1753
161
            if (itemIndex == nextInStack && (sideStageOpen || stage == ApplicationInfoInterface.MainStage)) {
1754
162
                return MathUtils.linearAnimation(0, 1, startScale, targetScale, progress);
1755
163
            }
1756
164
            return startScale;
1757
165
        }
1758
166
        if (itemIndex == nextInStack) {
1759
167
            return MathUtils.linearAnimation(0, 1, startScale, targetScale, progress)
1760
168
        }
1761
169
1762
170
        return MathUtils.linearAnimation(breakPoint, 1, startScale, targetScale, progress)
1763
171
    }
1764
172
1765
173
    readonly property bool itemVisible: true //animatedX < sceneWidth
1766
174
}
1767
0
175
1768
=== added file 'qml/Stage/Spread/WindowedRightEdgeMaths.qml'
1769
--- qml/Stage/Spread/WindowedRightEdgeMaths.qml	1970-01-01 00:00:00 +0000
1770
+++ qml/Stage/Spread/WindowedRightEdgeMaths.qml	2016-10-11 21:49:13 +0000
1771
@@ -0,0 +1,81 @@
1772
1
/*
1773
2
 * Copyright (C) 2016 Canonical, Ltd.
1774
3
 *
1775
4
 * This program is free software; you can redistribute it and/or modify
1776
5
 * it under the terms of the GNU General Public License as published by
1777
6
 * the Free Software Foundation; version 3.
1778
7
 *
1779
8
 * This program is distributed in the hope that it will be useful,
1780
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1781
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1782
11
 * GNU General Public License for more details.
1783
12
 *
1784
13
 * You should have received a copy of the GNU General Public License
1785
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1786
15
 */
1787
16
1788
17
import QtQuick 2.4
1789
18
import Ubuntu.Components 1.3
1790
19
import Unity.Application 0.1
1791
20
import "MathUtils.js" as MathUtils
1792
21
1793
22
QtObject {
1794
23
    id: root
1795
24
1796
25
    // Input
1797
26
    property int itemIndex: 0
1798
27
    property int normalZ: 0
1799
28
    property real progress: 0
1800
29
    property int startWidth: 0
1801
30
    property int startHeight: 0
1802
31
    property int startX: 0
1803
32
    property int targetX: 0
1804
33
    property int startY: 0
1805
34
    property int targetY: 0
1806
35
//    property real startAngle: 40
1807
36
    property real targetAngle: 0
1808
37
    property int targetHeight: 0
1809
38
    property real targetScale: 0
1810
39
1811
40
    // Config
1812
41
    property real breakPoint: 0.4
1813
42
1814
43
    // Output
1815
44
1816
45
    readonly property real scaleToPreviewProgress: {
1817
46
        return progress < breakPoint ? 0 : MathUtils.clamp(MathUtils.linearAnimation(breakPoint, 1, 0, 1, progress), 0, 1)
1818
47
    }
1819
48
    readonly property int animatedWidth: {
1820
49
        return progress < breakPoint ? root.startWidth : MathUtils.linearAnimation(breakPoint, 1, root.startWidth, targetHeight, progress)
1821
50
    }
1822
51
1823
52
    readonly property int animatedHeight: {
1824
53
        return progress < breakPoint ? root.startHeight : MathUtils.linearAnimation(breakPoint, 1, root.startHeight, targetHeight, progress)
1825
54
    }
1826
55
1827
56
    readonly property int animatedX: {
1828
57
        if (progress < breakPoint) {
1829
58
            return startX;
1830
59
        }
1831
60
        return MathUtils.linearAnimation(breakPoint, 1, startX, targetX, progress)
1832
61
    }
1833
62
1834
63
    readonly property int animatedY: progress < breakPoint ? startY : MathUtils.linearAnimation(breakPoint, 1, startY, targetY, progress)
1835
64
1836
65
    readonly property real animatedAngle: progress < breakPoint ? 0 : MathUtils.linearAnimation(breakPoint, 1, 0, targetAngle, progress);
1837
66
1838
67
    readonly property real decorationHeight: progress < breakPoint ? 1 : MathUtils.linearAnimation(breakPoint, 1, 1, 0, progress);
1839
68
1840
69
    readonly property int animatedZ: {
1841
70
        if (progress < breakPoint + (1 - breakPoint) / 2) {
1842
71
            return itemIndex == 1 ? normalZ + 2 : normalZ
1843
72
        }
1844
73
        return itemIndex
1845
74
    }
1846
75
1847
76
    readonly property real opacityMask: itemIndex == 1 ? MathUtils.linearAnimation(0, breakPoint, 0, 1, progress) : 1
1848
77
1849
78
    readonly property real animatedScale: progress < breakPoint ? 1 : MathUtils.linearAnimation(breakPoint, 1, 1, targetScale, progress)
1850
79
1851
80
//    readonly property bool itemVisible: true //animatedX < sceneWidth
1852
81
}
1853
0
82
1854
=== added file 'qml/Stage/Spread/cubic-bezier.js'
1855
--- qml/Stage/Spread/cubic-bezier.js	1970-01-01 00:00:00 +0000
1856
+++ qml/Stage/Spread/cubic-bezier.js	2016-10-11 21:49:13 +0000
1857
@@ -0,0 +1,39 @@
1858
1
/*
1859
2
 * Copyright (C) 2016 Canonical, Ltd.
1860
3
 *
1861
4
 * This program is free software; you can redistribute it and/or modify
1862
5
 * it under the terms of the GNU General Public License as published by
1863
6
 * the Free Software Foundation; version 3.
1864
7
 *
1865
8
 * This program is distributed in the hope that it will be useful,
1866
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1867
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1868
11
 * GNU General Public License for more details.
1869
12
 *
1870
13
 * You should have received a copy of the GNU General Public License
1871
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1872
15
 */
1873
16
1874
17
//====================================\\
1875
18
// 13thParallel.org Beziér Curve Code \\
1876
19
//   by Dan Pupius (www.pupius.net)   \\
1877
20
//====================================\\
1878
21
1879
22
1880
23
var coord = function (x,y) {
1881
24
  if(!x) var x=0;
1882
25
  if(!y) var y=0;
1883
26
  return {x: x, y: y};
1884
27
}
1885
28
1886
29
function B4(t) { return t*t*t }
1887
30
function B3(t) { return 3*t*t*(1-t) }
1888
31
function B2(t) { return 3*t*(1-t)*(1-t) }
1889
32
function B1(t) { return (1-t)*(1-t)*(1-t) }
1890
33
1891
34
var getBezier = function(percent,C1,C2,C3,C4) {
1892
35
  var pos = new coord();
1893
36
  pos.x = C1.x*B1(percent) + C2.x*B2(percent) + C3.x*B3(percent) + C4.x*B4(percent);
1894
37
  pos.y = C1.y*B1(percent) + C2.y*B2(percent) + C3.y*B3(percent) + C4.y*B4(percent);
1895
38
  return pos;
1896
39
}
1897
0
40
1898
=== renamed file 'qml/Stages/DesktopStage.qml' => 'qml/Stage/Stage.qml'
1899
--- qml/Stages/DesktopStage.qml	2016-09-07 08:36:59 +0000
1900
+++ qml/Stage/Stage.qml	2016-10-11 21:49:13 +0000
1901
@@ -22,75 +22,152 @@
1902
22
import Utils 0.1
22
import Utils 0.1
1903
23
import Ubuntu.Gestures 0.1
23
import Ubuntu.Gestures 0.1
1904
24
import GlobalShortcut 1.0
24
import GlobalShortcut 1.0
1905
25
import GSettings 1.0
1906
26
import "Spread"
1907
27
import "Spread/MathUtils.js" as MathUtils
1908
25
28
1910
26
AbstractStage {
29
FocusScope {
1911
27
    id: root
30
    id: root
1912
28
    anchors.fill: parent
31
    anchors.fill: parent
1931
29
    paintBackground: false
32
1932
30
33
    property QtObject applicationManager
1933
31
    // functions to be called from outside
34
    property QtObject topLevelSurfaceList
1934
32
    function updateFocusedAppOrientation() { /* TODO */ }
35
    property bool altTabPressed
1935
33
    function updateFocusedAppOrientationAnimated() { /* TODO */}
36
    property url background
1936
34
    function pushRightEdge(amount) {
37
    property int dragAreaWidth
1937
35
        if (spread.state === "") {
38
    property bool interactive
1938
36
            edgeBarrier.push(amount);
39
    property bool keepDashRunning: true
1939
37
        }
40
    property real nativeHeight
1940
38
    }
41
    property real nativeWidth
1941
39
    function closeFocusedDelegate() {
42
    property QtObject orientations
1942
40
        if (priv.focusedAppDelegate && !priv.focusedAppDelegate.isDash) {
43
    property int shellOrientation
1943
41
            priv.focusedAppDelegate.close();
44
    property int shellOrientationAngle
1944
42
        }
45
    property bool spreadEnabled: true // If false, animations and right edge will be disabled
1945
43
    }
46
    property bool suspended
1946
44
47
    property int leftMargin: 0
1947
45
    // Used by TutorialRight
48
    property bool oskEnabled: false
1948
46
    property bool spreadShown: spread.state == "altTab"
49
    property rect inputMethodRect
1949
50
1950
51
    // Configuration
1951
52
    property string mode: "staged"
1952
53
    property real leftEdgeDragProgress: 0
1953
54
1954
55
    // Used by the tutorial code
1955
56
    readonly property bool spreadShown: state == "spread"
1956
57
    readonly property real rightEdgeDragProgress: rightEdgeDragArea.progress // How far left the stage has been dragged
1957
47
58
1958
48
    // used by the snap windows (edge maximize) feature
59
    // used by the snap windows (edge maximize) feature
1959
49
    readonly property alias previewRectangle: fakeRectangle
60
    readonly property alias previewRectangle: fakeRectangle
1960
50
61
1962
51
    mainApp: priv.focusedAppDelegate ? priv.focusedAppDelegate.application : null
62
    readonly property var mainApp: priv.focusedAppDelegate ? priv.focusedAppDelegate.application : null
1963
52
63
1964
53
    // application windows never rotate independently
64
    // application windows never rotate independently
1971
54
    mainAppWindowOrientationAngle: shellOrientationAngle
65
    property int mainAppWindowOrientationAngle: shellOrientationAngle
1972
55
66
1973
56
    orientationChangesEnabled: true
67
    property bool orientationChangesEnabled: priv.focusedAppDelegate && priv.focusedAppDelegate.orientationChangesEnabled
1974
57
68
1975
58
69
    property int supportedOrientations: {
1976
59
    itemConfiningMouseCursor: !spreadShown && priv.focusedAppDelegate && priv.focusedAppDelegate.surface &&
70
        if (mainApp) {
1977
71
            switch (mode) {
1978
72
            case "staged":
1979
73
                return mainApp.supportedOrientations;
1980
74
            case "stagedWithSideStage":
1981
75
                var orientations = mainApp.supportedOrientations;
1982
76
                orientations |= Qt.LandscapeOrientation | Qt.InvertedLandscapeOrientation;
1983
77
                if (priv.sideStageItemId) {
1984
78
                    // If we have a sidestage app, support Portrait orientation
1985
79
                    // so that it will switch the sidestage app to mainstage on rotate to portrait
1986
80
                    orientations |= Qt.PortraitOrientation|Qt.InvertedPortraitOrientation;
1987
81
                }
1988
82
                return orientations;
1989
83
            }
1990
84
        }
1991
85
1992
86
        return Qt.PortraitOrientation |
1993
87
                Qt.LandscapeOrientation |
1994
88
                Qt.InvertedPortraitOrientation |
1995
89
                Qt.InvertedLandscapeOrientation;
1996
90
    }
1997
91
1998
92
1999
93
    onAltTabPressedChanged: priv.goneToSpread = altTabPressed
2000
94
2001
95
    property Item itemConfiningMouseCursor: !spreadShown && priv.focusedAppDelegate && priv.focusedAppDelegate.surface &&
2002
60
                              priv.focusedAppDelegate.surface.confinesMousePointer ?
96
                              priv.focusedAppDelegate.surface.confinesMousePointer ?
2003
61
                              priv.focusedAppDelegate.clientAreaItem : null;
97
                              priv.focusedAppDelegate.clientAreaItem : null;
2004
62
98
2005
99
    signal itemSnapshotRequested(Item item)
2006
100
2007
101
    // functions to be called from outside
2008
102
    function updateFocusedAppOrientation() { /* TODO */ }
2009
103
    function updateFocusedAppOrientationAnimated() { /* TODO */}
2010
104
    function pushRightEdge(amount) {
2011
105
        edgeBarrier.push(amount);
2012
106
    }
2013
107
2014
108
    onSpreadEnabledChanged: {
2015
109
        if (!spreadEnabled && root.state == "spread") {
2016
110
            priv.goneToSpread = false;
2017
111
        }
2018
112
    }
2019
113
2020
114
    GSettings {
2021
115
        id: lifecycleExceptions
2022
116
        schema.id: "com.canonical.qtmir"
2023
117
    }
2024
118
2025
119
    function isExemptFromLifecycle(appId) {
2026
120
        var shortAppId = appId.split('_')[0];
2027
121
        for (var i = 0; i < lifecycleExceptions.lifecycleExemptAppids.length; i++) {
2028
122
            if (shortAppId === lifecycleExceptions.lifecycleExemptAppids[i]) {
2029
123
                return true;
2030
124
            }
2031
125
        }
2032
126
        return false;
2033
127
    }
2034
128
2035
129
    GlobalShortcut {
2036
130
        id: closeFocusedShortcut
2037
131
        shortcut: Qt.AltModifier|Qt.Key_F4
2038
132
        onTriggered: {
2039
133
            if (priv.focusedAppDelegate && !priv.focusedAppDelegate.isDash) {
2040
134
                priv.focusedAppDelegate.close();
2041
135
            }
2042
136
        }
2043
137
    }
2044
138
2045
63
    GlobalShortcut {
139
    GlobalShortcut {
2046
64
        id: showSpreadShortcut
140
        id: showSpreadShortcut
2047
65
        shortcut: Qt.MetaModifier|Qt.Key_W
141
        shortcut: Qt.MetaModifier|Qt.Key_W
2049
66
        onTriggered: spread.state = "altTab"
142
        onTriggered: priv.goneToSpread = true
2050
67
    }
143
    }
2051
68
144
2052
69
    GlobalShortcut {
145
    GlobalShortcut {
2053
70
        id: minimizeAllShortcut
146
        id: minimizeAllShortcut
2054
71
        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_D
147
        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_D
2055
72
        onTriggered: priv.minimizeAllWindows()
148
        onTriggered: priv.minimizeAllWindows()
2056
149
        active: root.state == "windowed"
2057
73
    }
150
    }
2058
74
151
2059
75
    GlobalShortcut {
152
    GlobalShortcut {
2060
76
        id: maximizeWindowShortcut
153
        id: maximizeWindowShortcut
2061
77
        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Up
154
        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Up
2062
78
        onTriggered: priv.focusedAppDelegate.maximize()
155
        onTriggered: priv.focusedAppDelegate.maximize()
2064
79
        active: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.canBeMaximized
156
        active: root.state == "windowed" && priv.focusedAppDelegate && priv.focusedAppDelegate.canBeMaximized
2065
80
    }
157
    }
2066
81
158
2067
82
    GlobalShortcut {
159
    GlobalShortcut {
2068
83
        id: maximizeWindowLeftShortcut
160
        id: maximizeWindowLeftShortcut
2069
84
        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Left
161
        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Left
2070
85
        onTriggered: priv.focusedAppDelegate.maximizeLeft()
162
        onTriggered: priv.focusedAppDelegate.maximizeLeft()
2072
86
        active: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.canBeMaximizedLeftRight
163
        active: root.state == "windowed" && priv.focusedAppDelegate && priv.focusedAppDelegate.canBeMaximizedLeftRight
2073
87
    }
164
    }
2074
88
165
2075
89
    GlobalShortcut {
166
    GlobalShortcut {
2076
90
        id: maximizeWindowRightShortcut
167
        id: maximizeWindowRightShortcut
2077
91
        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Right
168
        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Right
2078
92
        onTriggered: priv.focusedAppDelegate.maximizeRight()
169
        onTriggered: priv.focusedAppDelegate.maximizeRight()
2080
93
        active: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.canBeMaximizedLeftRight
170
        active: root.state == "windowed" && priv.focusedAppDelegate && priv.focusedAppDelegate.canBeMaximizedLeftRight
2081
94
    }
171
    }
2082
95
172
2083
96
    GlobalShortcut {
173
    GlobalShortcut {
2084
@@ -98,7 +175,7 @@
2085
98
        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Down
175
        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Down
2086
99
        onTriggered: priv.focusedAppDelegate.anyMaximized
176
        onTriggered: priv.focusedAppDelegate.anyMaximized
2087
100
                     ? priv.focusedAppDelegate.restoreFromMaximized() : priv.focusedAppDelegate.minimize()
177
                     ? priv.focusedAppDelegate.restoreFromMaximized() : priv.focusedAppDelegate.minimize()
2089
101
        active: priv.focusedAppDelegate !== null
178
        active: root.state == "windowed" && priv.focusedAppDelegate
2090
102
    }
179
    }
2091
103
180
2092
104
    GlobalShortcut {
181
    GlobalShortcut {
2093
@@ -107,28 +184,17 @@
2094
107
        active: priv.focusedAppDelegate !== null
184
        active: priv.focusedAppDelegate !== null
2095
108
    }
185
    }
2096
109
186
2097
110
    Connections {
2098
111
        target: root.topLevelSurfaceList
2099
112
        onCountChanged: {
2100
113
            if (spread.state == "altTab") {
2101
114
                spread.cancel();
2102
115
            }
2103
116
        }
2104
117
    }
2105
118
2106
119
    QtObject {
187
    QtObject {
2107
120
        id: priv
188
        id: priv
2108
121
        objectName: "DesktopStagePrivate"
189
        objectName: "DesktopStagePrivate"
2109
122
190
2110
123
        property var focusedAppDelegate: null
191
        property var focusedAppDelegate: null
2111
124
        onFocusedAppDelegateChanged: {
2112
125
            if (spread.state == "altTab") {
2113
126
                spread.state = "";
2114
127
            }
2115
128
        }
2116
129
2117
130
        property var foregroundMaximizedAppDelegate: null // for stuff like drop shadow and focusing maximized app by clicking panel
192
        property var foregroundMaximizedAppDelegate: null // for stuff like drop shadow and focusing maximized app by clicking panel
2118
131
193
2119
194
        property bool goneToSpread: false
2120
195
        property int closingIndex: -1
2121
196
        property int animationDuration: UbuntuAnimation.FastDuration
2122
197
2123
132
        function updateForegroundMaximizedApp() {
198
        function updateForegroundMaximizedApp() {
2124
133
            var found = false;
199
            var found = false;
2125
134
            for (var i = 0; i < appRepeater.count && !found; i++) {
200
            for (var i = 0; i < appRepeater.count && !found; i++) {
2126
@@ -162,11 +228,93 @@
2127
162
            }
228
            }
2128
163
        }
229
        }
2129
164
230
2133
165
        readonly property real virtualKeyboardHeight: SurfaceManager.inputMethodSurface
231
        readonly property bool sideStageEnabled: root.mode === "stagedWithSideStage" &&
2134
166
                                                          ? SurfaceManager.inputMethodSurface.inputBounds.height
232
                                                 (root.shellOrientation == Qt.LandscapeOrientation ||
2135
167
                                                          : 0
233
                                                 root.shellOrientation == Qt.InvertedLandscapeOrientation)
2136
234
2137
235
        property var mainStageDelegate: null
2138
236
        property var sideStageDelegate: null
2139
237
        property int mainStageItemId: 0
2140
238
        property int sideStageItemId: 0
2141
239
        property string mainStageAppId: ""
2142
240
        property string sideStageAppId: ""
2143
241
2144
242
        onSideStageDelegateChanged: {
2145
243
            if (!sideStageDelegate) {
2146
244
                sideStage.hide();
2147
245
            }
2148
246
        }
2149
247
2150
248
        function updateMainAndSideStageIndexes() {
2151
249
            if (root.mode != "stagedWithSideStage") {
2152
250
                priv.sideStageDelegate = null;
2153
251
                priv.sideStageItemId = 0;
2154
252
                priv.sideStageAppId = "";
2155
253
                priv.mainStageDelegate = appRepeater.itemAt(0);
2156
254
                priv.mainStageAppId = topLevelSurfaceList.idAt(0);
2157
255
                priv.mainStageAppId = topLevelSurfaceList.applicationAt(0) ? topLevelSurfaceList.applicationAt(0).appId : ""
2158
256
                return;
2159
257
            }
2160
258
2161
259
            var choseMainStage = false;
2162
260
            var choseSideStage = false;
2163
261
2164
262
            if (!root.topLevelSurfaceList)
2165
263
                return;
2166
264
2167
265
            for (var i = 0; i < appRepeater.count && (!choseMainStage || !choseSideStage); ++i) {
2168
266
                var appDelegate = appRepeater.itemAt(i);
2169
267
                if (!appDelegate) {
2170
268
                    // This might happen during startup phase... If the delegate appears and claims focus
2171
269
                    // things are updated and appRepeater.itemAt(x) still returns null while appRepeater.count >= x
2172
270
                    // Lets just skip it, on startup it will be generated at a later point too...
2173
271
                    continue;
2174
272
                }
2175
273
                if (sideStage.shown && appDelegate.stage == ApplicationInfoInterface.SideStage
2176
274
                        && !choseSideStage) {
2177
275
                    priv.sideStageDelegate = appDelegate
2178
276
                    priv.sideStageItemId = root.topLevelSurfaceList.idAt(i);
2179
277
                    priv.sideStageAppId = root.topLevelSurfaceList.applicationAt(i).appId;
2180
278
                    choseSideStage = true;
2181
279
                } else if (!choseMainStage && appDelegate.stage == ApplicationInfoInterface.MainStage) {
2182
280
                    priv.mainStageDelegate = appDelegate;
2183
281
                    priv.mainStageItemId = root.topLevelSurfaceList.idAt(i);
2184
282
                    priv.mainStageAppId = root.topLevelSurfaceList.applicationAt(i).appId;
2185
283
                    choseMainStage = true;
2186
284
                }
2187
285
            }
2188
286
            if (!choseMainStage && priv.mainStageDelegate) {
2189
287
                priv.mainStageDelegate = null;
2190
288
                priv.mainStageItemId = 0;
2191
289
                priv.mainStageAppId = "";
2192
290
            }
2193
291
            if (!choseSideStage && priv.sideStageDelegate) {
2194
292
                priv.sideStageDelegate = null;
2195
293
                priv.sideStageItemId = 0;
2196
294
                priv.sideStageAppId = "";
2197
295
            }
2198
296
        }
2199
297
2200
298
        property int nextInStack: {
2201
299
            var mainStageIndex = priv.mainStageDelegate ? priv.mainStageDelegate.itemIndex : -1;
2202
300
            var sideStageIndex = priv.sideStageDelegate ? priv.sideStageDelegate.itemIndex : -1;
2203
301
            if (sideStageIndex == -1) {
2204
302
                return topLevelSurfaceList.count > 1 ? 1 : -1;
2205
303
            }
2206
304
            if (mainStageIndex == 0 || sideStageIndex == 0) {
2207
305
                if (mainStageIndex == 1 || sideStageIndex == 1) {
2208
306
                    return topLevelSurfaceList.count > 2 ? 2 : -1;
2209
307
                }
2210
308
                return 1;
2211
309
            }
2212
310
            return -1;
2213
311
        }
2214
312
2215
313
        readonly property real virtualKeyboardHeight: root.inputMethodRect.height
2216
168
    }
314
    }
2217
169
315
2218
316
    Component.onCompleted: priv.updateMainAndSideStageIndexes();
2219
317
2220
170
    Connections {
318
    Connections {
2221
171
        target: PanelState
319
        target: PanelState
2222
172
        onCloseClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.close(); } }
320
        onCloseClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.close(); } }
2223
@@ -178,14 +326,13 @@
2224
178
        target: PanelState
326
        target: PanelState
2225
179
        property: "buttonsVisible"
327
        property: "buttonsVisible"
2226
180
        value: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.maximized // FIXME for Locally integrated menus
328
        value: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.maximized // FIXME for Locally integrated menus
2227
181
               && spread.state == ""
2228
182
    }
329
    }
2229
183
330
2230
184
    Binding {
331
    Binding {
2231
185
        target: PanelState
332
        target: PanelState
2232
186
        property: "title"
333
        property: "title"
2233
187
        value: {
334
        value: {
2235
188
            if (priv.focusedAppDelegate !== null && spread.state == "") {
335
            if (priv.focusedAppDelegate !== null) {
2236
189
                if (priv.focusedAppDelegate.maximized)
336
                if (priv.focusedAppDelegate.maximized)
2237
190
                    return priv.focusedAppDelegate.title
337
                    return priv.focusedAppDelegate.title
2238
191
                else
338
                else
2239
@@ -199,7 +346,7 @@
2240
199
    Binding {
346
    Binding {
2241
200
        target: PanelState
347
        target: PanelState
2242
201
        property: "dropShadow"
348
        property: "dropShadow"
2244
202
        value: priv.focusedAppDelegate && !priv.focusedAppDelegate.maximized && priv.foregroundMaximizedAppDelegate !== null
349
        value: priv.focusedAppDelegate && !priv.focusedAppDelegate.maximized && priv.foregroundMaximizedAppDelegate !== null && mode == "windowed"
2245
203
    }
350
    }
2246
204
351
2247
205
    Binding {
352
    Binding {
2248
@@ -216,16 +363,34 @@
2249
216
363
2250
217
    Instantiator {
364
    Instantiator {
2251
218
        model: root.applicationManager
365
        model: root.applicationManager
2262
219
        delegate: Binding {
366
        delegate: QtObject {
2263
220
            target: model.application
367
            property var stateBinding: Binding {
2264
221
            property: "requestedState"
368
                readonly property bool isDash: model.application ? model.application.appId == "unity8-dash" : false
2265
222
369
                target: model.application
2266
223
            // TODO: figure out some lifecycle policy, like suspending minimized apps
370
                property: "requestedState"
2267
224
            //       if running on a tablet or something.
371
2268
225
            // TODO: If the device has a dozen suspended apps because it was running
372
                // TODO: figure out some lifecycle policy, like suspending minimized apps
2269
226
            //       in staged mode, when it switches to Windowed mode it will suddenly
373
                //       or something if running windowed.
2270
227
            //       resume all those apps at once. We might want to avoid that.
374
                // TODO: If the device has a dozen suspended apps because it was running
2271
228
            value: ApplicationInfoInterface.RequestedRunning // Always running for now
375
                //       in staged mode, when it switches to Windowed mode it will suddenly
2272
376
                //       resume all those apps at once. We might want to avoid that.
2273
377
                value: root.mode === "windowed"
2274
378
                       || (isDash && root.keepDashRunning)
2275
379
                       || (!root.suspended && model.application && priv.focusedAppDelegate &&
2276
380
                           (priv.focusedAppDelegate.appId === model.application.appId ||
2277
381
                            priv.mainStageAppId === model.application.appId ||
2278
382
                            priv.sideStageAppId === model.application.appId))
2279
383
                       ? ApplicationInfoInterface.RequestedRunning
2280
384
                       : ApplicationInfoInterface.RequestedSuspended
2281
385
            }
2282
386
2283
387
            property var lifecycleBinding: Binding {
2284
388
                target: model.application
2285
389
                property: "exemptFromLifecycle"
2286
390
                value: model.application
2287
391
                            ? (!model.application.isTouchApp || isExemptFromLifecycle(model.application.appId))
2288
392
                            : false
2289
393
            }
2290
229
        }
394
        }
2291
230
    }
395
    }
2292
231
396
2293
@@ -236,16 +401,203 @@
2294
236
        when: !appRepeater.startingUp && root.parent
401
        when: !appRepeater.startingUp && root.parent
2295
237
    }
402
    }
2296
238
403
2297
404
    states: [
2298
405
        State {
2299
406
            name: "spread"; when: priv.goneToSpread
2300
407
            PropertyChanges { target: floatingFlickable; enabled: true }
2301
408
            PropertyChanges { target: spreadItem; focus: true }
2302
409
            PropertyChanges { target: hoverMouseArea; enabled: true }
2303
410
            PropertyChanges { target: rightEdgeDragArea; enabled: false }
2304
411
            PropertyChanges { target: cancelSpreadMouseArea; enabled: true }
2305
412
        },
2306
413
        State {
2307
414
            name: "stagedRightEdge"; when: (rightEdgeDragArea.dragging || edgeBarrier.progress > 0) && root.mode == "staged"
2308
415
        },
2309
416
        State {
2310
417
            name: "sideStagedRightEdge"; when: (rightEdgeDragArea.dragging || edgeBarrier.progress > 0) && root.mode == "stagedWithSideStage"
2311
418
            PropertyChanges {
2312
419
                target: sideStage
2313
420
                opacity: priv.sideStageDelegate.x === sideStage.x ? 1 : 0
2314
421
                visible: true
2315
422
            }
2316
423
        },
2317
424
        State {
2318
425
            name: "windowedRightEdge"; when: (rightEdgeDragArea.dragging || edgeBarrier.progress > 0) && root.mode == "windowed"
2319
426
        },
2320
427
        State {
2321
428
            name: "staged"; when: root.mode === "staged"
2322
429
        },
2323
430
        State {
2324
431
            name: "stagedWithSideStage"; when: root.mode === "stagedWithSideStage"
2325
432
            PropertyChanges { target: triGestureArea; enabled: true }
2326
433
            PropertyChanges { target: sideStage; visible: true }
2327
434
        },
2328
435
        State {
2329
436
            name: "windowed"; when: root.mode === "windowed"
2330
437
        }
2331
438
    ]
2332
439
    transitions: [
2333
440
        Transition {
2334
441
            from: "stagedRightEdge,sideStagedRightEdge,windowedRightEdge"; to: "spread"
2335
442
            PropertyAction { target: spreadItem; property: "highlightedIndex"; value: -1 }
2336
443
        },
2337
444
        Transition {
2338
445
            to: "spread"
2339
446
            PropertyAction { target: spreadItem; property: "highlightedIndex"; value: appRepeater.count > 1 ? 1 : 0 }
2340
447
            PropertyAction { target: floatingFlickable; property: "contentX"; value: 0 }
2341
448
        },
2342
449
        Transition {
2343
450
            from: "spread"
2344
451
            SequentialAnimation {
2345
452
                ScriptAction {
2346
453
                    script: {
2347
454
                        var item = appRepeater.itemAt(Math.max(0, spreadItem.highlightedIndex));
2348
455
                        if (item.stage == ApplicationInfoInterface.SideStage && !sideStage.shown) {
2349
456
                            sideStage.show();
2350
457
                        }
2351
458
                        item.playFocusAnimation();
2352
459
                    }
2353
460
                }
2354
461
                PropertyAction { target: spreadItem; property: "highlightedIndex"; value: -1 }
2355
462
            }
2356
463
        },
2357
464
        Transition {
2358
465
            to: "stagedRightEdge"
2359
466
            PropertyAction { target: floatingFlickable; property: "contentX"; value: 0 }
2360
467
        },
2361
468
        Transition {
2362
469
            to: "stagedWithSideStage"
2363
470
            ScriptAction { script: priv.updateMainAndSideStageIndexes(); }
2364
471
        }
2365
472
2366
473
    ]
2367
474
2368
475
    MouseArea {
2369
476
        id: cancelSpreadMouseArea
2370
477
        anchors.fill: parent
2371
478
        enabled: false
2372
479
        onClicked: priv.goneToSpread = false
2373
480
    }
2374
481
2375
239
    FocusScope {
482
    FocusScope {
2376
240
        id: appContainer
483
        id: appContainer
2377
241
        objectName: "appContainer"
484
        objectName: "appContainer"
2378
242
        anchors.fill: parent
485
        anchors.fill: parent
2380
243
        focus: spread.state !== "altTab"
486
        focus: true
2381
244
487
2382
245
        Wallpaper {
488
        Wallpaper {
2383
246
            id: wallpaper
489
            id: wallpaper
2384
247
            anchors.fill: parent
490
            anchors.fill: parent
2385
248
            source: root.background
491
            source: root.background
2386
492
            // Make sure it's the lowest item. Due to the left edge drag we sometimes need
2387
493
            // to put the dash at -1 and we don't want it behind the Wallpaper
2388
494
            z: -2
2389
495
        }
2390
496
2391
497
        Spread {
2392
498
            id: spreadItem
2393
499
            objectName: "spreadItem"
2394
500
            anchors.fill: appContainer
2395
501
            leftMargin: root.leftMargin
2396
502
            model: root.topLevelSurfaceList
2397
503
            spreadFlickable: floatingFlickable
2398
504
            z: 10
2399
505
2400
506
            onLeaveSpread: {
2401
507
                priv.goneToSpread = false;
2402
508
            }
2403
509
        }
2404
510
2405
511
        Connections {
2406
512
            target: root.topLevelSurfaceList
2407
513
            onListChanged: priv.updateMainAndSideStageIndexes()
2408
514
        }
2409
515
2410
516
2411
517
        DropArea {
2412
518
            objectName: "MainStageDropArea"
2413
519
            anchors {
2414
520
                left: parent.left
2415
521
                top: parent.top
2416
522
                bottom: parent.bottom
2417
523
            }
2418
524
            width: appContainer.width - sideStage.width
2419
525
            enabled: sideStage.enabled
2420
526
2421
527
            onDropped: {
2422
528
                drop.source.appDelegate.saveStage(ApplicationInfoInterface.MainStage);
2423
529
                drop.source.appDelegate.focus = true;
2424
530
            }
2425
531
            keys: "SideStage"
2426
532
        }
2427
533
2428
534
        SideStage {
2429
535
            id: sideStage
2430
536
            objectName: "sideStage"
2431
537
            shown: false
2432
538
            height: appContainer.height
2433
539
            x: appContainer.width - width
2434
540
            visible: false
2435
541
            Behavior on opacity { UbuntuNumberAnimation {} }
2436
542
            z: {
2437
543
                if (!priv.mainStageItemId) return 0;
2438
544
2439
545
                if (priv.sideStageItemId && priv.nextInStack > 0) {
2440
546
2441
547
                    // Due the order in which bindings are evaluated, this might be triggered while shuffling
2442
548
                    // the list and index doesn't yet match with itemIndex (even though itemIndex: index)
2443
549
                    // Let's walk the list and compare itemIndex to make sure we have the correct one.
2444
550
                    var nextDelegateInStack = -1;
2445
551
                    for (var i = 0; i < appRepeater.count; i++) {
2446
552
                        if (appRepeater.itemAt(i).itemIndex == priv.nextInStack) {
2447
553
                            nextDelegateInStack = appRepeater.itemAt(i);
2448
554
                            break;
2449
555
                        }
2450
556
                    }
2451
557
2452
558
                    if (nextDelegateInStack.stage ===  ApplicationInfoInterface.MainStage) {
2453
559
                        // if the next app in stack is a main stage app, put the sidestage on top of it.
2454
560
                        return 2;
2455
561
                    }
2456
562
                    return 1;
2457
563
                }
2458
564
2459
565
                return 1;
2460
566
            }
2461
567
2462
568
            onShownChanged: {
2463
569
                if (!shown && priv.mainStageDelegate) {
2464
570
                    priv.mainStageDelegate.claimFocus();
2465
571
                }
2466
572
            }
2467
573
2468
574
            DropArea {
2469
575
                id: sideStageDropArea
2470
576
                objectName: "SideStageDropArea"
2471
577
                anchors.fill: parent
2472
578
2473
579
                property bool dropAllowed: true
2474
580
2475
581
                onEntered: {
2476
582
                    dropAllowed = drag.keys != "Disabled";
2477
583
                }
2478
584
                onExited: {
2479
585
                    dropAllowed = true;
2480
586
                }
2481
587
                onDropped: {
2482
588
                    if (drop.keys == "MainStage") {
2483
589
                        drop.source.appDelegate.saveStage(ApplicationInfoInterface.SideStage);
2484
590
                        drop.source.appDelegate.focus = true;
2485
591
                    }
2486
592
                }
2487
593
                drag {
2488
594
                    onSourceChanged: {
2489
595
                        if (!sideStageDropArea.drag.source) {
2490
596
                            dropAllowed = true;
2491
597
                        }
2492
598
                    }
2493
599
                }
2494
600
            }
2495
249
        }
601
        }
2496
250
602
2497
251
        TopLevelSurfaceRepeater {
603
        TopLevelSurfaceRepeater {
2498
@@ -256,6 +608,7 @@
2499
256
            delegate: FocusScope {
608
            delegate: FocusScope {
2500
257
                id: appDelegate
609
                id: appDelegate
2501
258
                objectName: "appDelegate_" + model.id
610
                objectName: "appDelegate_" + model.id
2502
611
                property int itemIndex: index // We need this from outside the repeater
2503
259
                // z might be overriden in some cases by effects, but we need z ordering
612
                // z might be overriden in some cases by effects, but we need z ordering
2504
260
                // to calculate occlusion detection
613
                // to calculate occlusion detection
2505
261
                property int normalZ: topLevelSurfaceList.count - index
614
                property int normalZ: topLevelSurfaceList.count - index
2506
@@ -265,10 +618,33 @@
2507
265
                    }
618
                    }
2508
266
                }
619
                }
2509
267
                z: normalZ
620
                z: normalZ
2514
268
                x: requestedX // may be overridden in some states. Do not directly write to this.
621
2515
269
                y: requestedY // may be overridden in some states. Do not directly write to this.
622
                // Normally we want x/y where we request it to be. Width/height of our delegate will
2516
270
                property real requestedX: priv.focusedAppDelegate ? priv.focusedAppDelegate.x + units.gu(3) : (normalZ - 1) * units.gu(3)
623
                // match what the actual surface size is.
2517
271
                property real requestedY: priv.focusedAppDelegate ? priv.focusedAppDelegate.y + units.gu(3) : normalZ * units.gu(3)
624
                // Don't write to those, they will be set by states
2518
625
                x: requestedX
2519
626
                y: requestedY
2520
627
                width: decoratedWindow.implicitWidth
2521
628
                height: decoratedWindow.implicitHeight
2522
629
2523
630
                // requestedX/Y/width/height is what we ask the actual surface to be.
2524
631
                // Do not write to those, they will be set by states
2525
632
                property real requestedX: windowedX
2526
633
                property real requestedY: windowedY
2527
634
                property real requestedWidth: windowedWidth
2528
635
                property real requestedHeight: windowedHeight
2529
636
2530
637
                // In those are for windowed mode. Those values basically store the window's properties
2531
638
                // when having a floating window. If you want to move/resize a window in normal mode, this is what you want to write to.
2532
639
                property real windowedX
2533
640
                property real windowedY
2534
641
                property real windowedWidth
2535
642
                property real windowedHeight
2536
643
2537
644
                // unlike windowedX/Y, this is the last known grab position before being pushed against edges/corners
2538
645
                // when restoring, the window should return to these, not to the place where it was dropped near the edge
2539
646
                property real restoredX
2540
647
                property real restoredY
2541
272
648
2542
273
                Binding {
649
                Binding {
2543
274
                    target: appDelegate
650
                    target: appDelegate
2544
@@ -277,27 +653,24 @@
2545
277
                           Math.min(appDelegate.requestedY - PanelState.panelHeight,
653
                           Math.min(appDelegate.requestedY - PanelState.panelHeight,
2546
278
                                    Math.max(0, priv.virtualKeyboardHeight - (appContainer.height - (appDelegate.requestedY + appDelegate.height))))
654
                                    Math.max(0, priv.virtualKeyboardHeight - (appContainer.height - (appDelegate.requestedY + appDelegate.height))))
2547
279
                    when: root.oskEnabled && appDelegate.focus && (appDelegate.state == "normal" || appDelegate.state == "restored")
655
                    when: root.oskEnabled && appDelegate.focus && (appDelegate.state == "normal" || appDelegate.state == "restored")
2551
280
                          && SurfaceManager.inputMethodSurface
656
                          && root.inputMethodRect.height > 0
2549
281
                          && SurfaceManager.inputMethodSurface.state != Mir.HiddenState
2550
282
                          && SurfaceManager.inputMethodSurface.state != Mir.MinimizedState
2552
283
657
2553
284
                }
658
                }
2554
285
659
2557
286
                width: decoratedWindow.width
660
                Behavior on x { id: xBehavior; enabled: priv.closingIndex >= 0; UbuntuNumberAnimation { onRunningChanged: if (!running) priv.closingIndex = -1} }
2556
287
                height: decoratedWindow.height
2558
288
661
2559
289
                Connections {
662
                Connections {
2560
290
                    target: root
663
                    target: root
2561
291
                    onShellOrientationAngleChanged: {
664
                    onShellOrientationAngleChanged: {
2562
292
                        // at this point decoratedWindow.surfaceOrientationAngle is the old shellOrientationAngle
665
                        // at this point decoratedWindow.surfaceOrientationAngle is the old shellOrientationAngle
2563
293
                        if (application && application.rotatesWindowContents) {
666
                        if (application && application.rotatesWindowContents) {
2565
294
                            if (state == "normal" || state == "restored") {
667
                            if (root.state == "windowed") {
2566
295
                                var angleDiff = decoratedWindow.surfaceOrientationAngle - shellOrientationAngle;
668
                                var angleDiff = decoratedWindow.surfaceOrientationAngle - shellOrientationAngle;
2567
296
                                angleDiff = (360 + angleDiff) % 360;
669
                                angleDiff = (360 + angleDiff) % 360;
2568
297
                                if (angleDiff === 90 || angleDiff === 270) {
670
                                if (angleDiff === 90 || angleDiff === 270) {
2569
298
                                    var aux = decoratedWindow.requestedHeight;
671
                                    var aux = decoratedWindow.requestedHeight;
2572
299
                                    decoratedWindow.requestedHeight = decoratedWindow.requestedWidth + decoratedWindow.visibleDecorationHeight;
672
                                    decoratedWindow.requestedHeight = decoratedWindow.requestedWidth + decoratedWindow.decorationHeight;
2573
300
                                    decoratedWindow.requestedWidth = aux - decoratedWindow.visibleDecorationHeight;
673
                                    decoratedWindow.requestedWidth = aux - decoratedWindow.decorationHeight;
2574
301
                                }
674
                                }
2575
302
                            }
675
                            }
2576
303
                            decoratedWindow.surfaceOrientationAngle = shellOrientationAngle;
676
                            decoratedWindow.surfaceOrientationAngle = shellOrientationAngle;
2577
@@ -306,6 +679,10 @@
2578
306
                        }
679
                        }
2579
307
                    }
680
                    }
2580
308
                }
681
                }
2581
682
                Connections {
2582
683
                    target: priv
2583
684
                    onSideStageEnabledChanged: refreshStage()
2584
685
                }
2585
309
686
2586
310
                readonly property alias application: decoratedWindow.application
687
                readonly property alias application: decoratedWindow.application
2587
311
                readonly property alias minimumWidth: decoratedWindow.minimumWidth
688
                readonly property alias minimumWidth: decoratedWindow.minimumWidth
2588
@@ -314,8 +691,6 @@
2589
314
                readonly property alias maximumHeight: decoratedWindow.maximumHeight
691
                readonly property alias maximumHeight: decoratedWindow.maximumHeight
2590
315
                readonly property alias widthIncrement: decoratedWindow.widthIncrement
692
                readonly property alias widthIncrement: decoratedWindow.widthIncrement
2591
316
                readonly property alias heightIncrement: decoratedWindow.heightIncrement
693
                readonly property alias heightIncrement: decoratedWindow.heightIncrement
2592
317
                property int requestedWidth: -1
2593
318
                property int requestedHeight: -1
2594
319
694
2595
320
                readonly property bool maximized: windowState === WindowStateStorage.WindowStateMaximized
695
                readonly property bool maximized: windowState === WindowStateStorage.WindowStateMaximized
2596
321
                readonly property bool maximizedLeft: windowState === WindowStateStorage.WindowStateMaximizedLeft
696
                readonly property bool maximizedLeft: windowState === WindowStateStorage.WindowStateMaximizedLeft
2597
@@ -330,7 +705,7 @@
2598
330
                                                     maximizedTopLeft || maximizedTopRight || maximizedBottomLeft || maximizedBottomRight
705
                                                     maximizedTopLeft || maximizedTopRight || maximizedBottomLeft || maximizedBottomRight
2599
331
706
2600
332
                readonly property bool minimized: windowState & WindowStateStorage.WindowStateMinimized
707
                readonly property bool minimized: windowState & WindowStateStorage.WindowStateMinimized
2602
333
                readonly property alias fullscreen: decoratedWindow.fullscreen
708
                readonly property bool fullscreen: surface ? surface.state === Mir.FullscreenState : application.fullscreen
2603
334
709
2604
335
                readonly property bool canBeMaximized: canBeMaximizedHorizontally && canBeMaximizedVertically
710
                readonly property bool canBeMaximized: canBeMaximizedHorizontally && canBeMaximizedVertically
2605
336
                readonly property bool canBeMaximizedLeftRight: (maximumWidth == 0 || maximumWidth >= appContainer.width/2) &&
711
                readonly property bool canBeMaximizedLeftRight: (maximumWidth == 0 || maximumWidth >= appContainer.width/2) &&
2606
@@ -339,6 +714,7 @@
2607
339
                                                             (maximumHeight == 0 || maximumHeight >= appContainer.height/2)
714
                                                             (maximumHeight == 0 || maximumHeight >= appContainer.height/2)
2608
340
                readonly property bool canBeMaximizedHorizontally: maximumWidth == 0 || maximumWidth >= appContainer.width
715
                readonly property bool canBeMaximizedHorizontally: maximumWidth == 0 || maximumWidth >= appContainer.width
2609
341
                readonly property bool canBeMaximizedVertically: maximumHeight == 0 || maximumHeight >= appContainer.height
716
                readonly property bool canBeMaximizedVertically: maximumHeight == 0 || maximumHeight >= appContainer.height
2610
717
                readonly property alias orientationChangesEnabled: decoratedWindow.orientationChangesEnabled
2611
342
718
2612
343
                property int windowState: WindowStateStorage.WindowStateNormal
719
                property int windowState: WindowStateStorage.WindowStateNormal
2613
344
                property bool animationsEnabled: true
720
                property bool animationsEnabled: true
2614
@@ -347,23 +723,45 @@
2615
347
                property bool visuallyMaximized: false
723
                property bool visuallyMaximized: false
2616
348
                property bool visuallyMinimized: false
724
                property bool visuallyMinimized: false
2617
349
725
2618
726
                property int stage: ApplicationInfoInterface.MainStage
2619
727
                function saveStage(newStage) {
2620
728
                    appDelegate.stage = newStage;
2621
729
                    WindowStateStorage.saveStage(appId, newStage);
2622
730
                    priv.updateMainAndSideStageIndexes()
2623
731
                }
2624
732
2625
350
                readonly property var surface: model.surface
733
                readonly property var surface: model.surface
2626
351
                readonly property alias resizeArea: resizeArea
734
                readonly property alias resizeArea: resizeArea
2627
352
                readonly property alias focusedSurface: decoratedWindow.focusedSurface
735
                readonly property alias focusedSurface: decoratedWindow.focusedSurface
2628
353
                readonly property bool dragging: touchControls.overlayShown ? touchControls.dragging : decoratedWindow.dragging
736
                readonly property bool dragging: touchControls.overlayShown ? touchControls.dragging : decoratedWindow.dragging
2629
354
737
2631
355
                readonly property bool isDash: model.application.appId == "unity8-dash"
738
                readonly property string appId: model.application.appId
2632
739
                readonly property bool isDash: appId == "unity8-dash"
2633
356
                readonly property alias clientAreaItem: decoratedWindow.clientAreaItem
740
                readonly property alias clientAreaItem: decoratedWindow.clientAreaItem
2634
357
741
2635
358
                function claimFocus() {
742
                function claimFocus() {
2640
359
                    if (spread.state == "altTab") {
743
                    if (root.state == "spread") {
2641
360
                        spread.cancel();
744
                        spreadItem.highlightedIndex = index
2642
361
                    }
745
                        priv.goneToSpread = false;
2643
362
                    appDelegate.restore(true /* animated */, appDelegate.windowState);
746
                    }
2644
747
                    if (root.mode == "stagedWithSideStage") {
2645
748
                        if (appDelegate.stage == ApplicationInfoInterface.SideStage && !sideStage.shown) {
2646
749
                            sideStage.show();
2647
750
                        }
2648
751
                        priv.updateMainAndSideStageIndexes();
2649
752
                    }
2650
753
2651
754
                    if (root.mode == "windowed") {
2652
755
                        appDelegate.restore(true /* animated */, appDelegate.windowState);
2653
756
                    } else {
2654
757
                        appDelegate.focus = true;
2655
758
                    }
2656
363
                }
759
                }
2657
364
                Connections {
760
                Connections {
2658
365
                    target: model.surface
761
                    target: model.surface
2660
366
                    onFocusRequested: claimFocus();
762
                    onFocusRequested: {
2661
763
                        claimFocus();
2662
764
                    }
2663
367
                }
765
                }
2664
368
                Connections {
766
                Connections {
2665
369
                    target: model.application
767
                    target: model.application
2666
@@ -383,14 +781,9 @@
2667
383
                        return;
781
                        return;
2668
384
782
2669
385
                    if (focus) {
783
                    if (focus) {
2676
386
                        // If we're orphan (!parent) it means this stage is no longer the current one
784
                        topLevelSurfaceList.raiseId(model.id);
2671
387
                        // and will be deleted shortly. So we should no longer have a say over the model
2672
388
                        if (root.parent) {
2673
389
                            topLevelSurfaceList.raiseId(model.id);
2674
390
                        }
2675
391
2677
392
                        priv.focusedAppDelegate = appDelegate;
785
                        priv.focusedAppDelegate = appDelegate;
2679
393
                    } else if (!focus && priv.focusedAppDelegate === appDelegate) {
786
                    } else if (!focus && priv.focusedAppDelegate === appDelegate && root.state != "spread") {
2680
394
                        priv.focusedAppDelegate = null;
787
                        priv.focusedAppDelegate = null;
2681
395
                        // FIXME: No idea why the Binding{} doens't update when focusedAppDelegate turns null
788
                        // FIXME: No idea why the Binding{} doens't update when focusedAppDelegate turns null
2682
396
                        MirFocusController.focusedSurface = null;
789
                        MirFocusController.focusedSurface = null;
2683
@@ -403,13 +796,25 @@
2684
403
                        decoratedWindow.surfaceOrientationAngle = 0;
796
                        decoratedWindow.surfaceOrientationAngle = 0;
2685
404
                    }
797
                    }
2686
405
798
2687
799
                    // First, cascade the newly created window, relative to the currently/old focused window.
2688
800
                    windowedX = priv.focusedAppDelegate ? priv.focusedAppDelegate.windowedX + units.gu(3) : (normalZ - 1) * units.gu(3)
2689
801
                    windowedY = priv.focusedAppDelegate ? priv.focusedAppDelegate.windowedY + units.gu(3) : normalZ * units.gu(3)
2690
802
                    // Now load any saved state. This needs to happen *after* the cascading!
2691
803
                    resizeArea.loadWindowState();
2692
804
2693
406
                    // NB: We're differentiating if this delegate was created in response to a new entry in the model
805
                    // NB: We're differentiating if this delegate was created in response to a new entry in the model
2694
407
                    //     or if the Repeater is just populating itself with delegates to match the model it received.
806
                    //     or if the Repeater is just populating itself with delegates to match the model it received.
2695
408
                    if (!appRepeater.startingUp) {
807
                    if (!appRepeater.startingUp) {
2696
409
                        // a top level window is always the focused one when it first appears, unfocusing
808
                        // a top level window is always the focused one when it first appears, unfocusing
2697
410
                        // any preexisting one
809
                        // any preexisting one
2699
411
                        focus = true;
810
                        if (root.state == "spread") {
2700
811
                            spreadItem.highlightedIndex = index;
2701
812
                        }
2702
813
                        claimFocus();
2703
412
                    }
814
                    }
2704
815
2705
816
                    refreshStage();
2706
817
                    _constructing = false;
2707
413
                }
818
                }
2708
414
                Component.onDestruction: {
819
                Component.onDestruction: {
2709
415
                    if (!root.parent) {
820
                    if (!root.parent) {
2710
@@ -435,13 +840,20 @@
2711
435
840
2712
436
                onVisuallyMaximizedChanged: priv.updateForegroundMaximizedApp()
841
                onVisuallyMaximizedChanged: priv.updateForegroundMaximizedApp()
2713
437
842
2714
843
                property bool _constructing: true;
2715
844
                onStageChanged: {
2716
845
                    if (!_constructing) {
2717
846
                        priv.updateMainAndSideStageIndexes();
2718
847
                    }
2719
848
                }
2720
849
2721
438
                visible: (
850
                visible: (
2722
439
                          !visuallyMinimized
851
                          !visuallyMinimized
2723
440
                          && !greeter.fullyShown
852
                          && !greeter.fullyShown
2724
441
                          && (priv.foregroundMaximizedAppDelegate === null || priv.foregroundMaximizedAppDelegate.normalZ <= z)
853
                          && (priv.foregroundMaximizedAppDelegate === null || priv.foregroundMaximizedAppDelegate.normalZ <= z)
2725
442
                         )
854
                         )
2728
443
                         || decoratedWindow.fullscreen
855
                         || appDelegate.fullscreen
2729
444
                         || (spread.state == "altTab" && index === spread.highlightedIndex)
856
                         || focusAnimation.running || rightEdgeFocusAnimation.running || hidingAnimation.running
2730
445
857
2731
446
                function close() {
858
                function close() {
2732
447
                    model.surface.close();
859
                    model.surface.close();
2733
@@ -499,7 +911,44 @@
2734
499
                }
911
                }
2735
500
912
2736
501
                function playFocusAnimation() {
913
                function playFocusAnimation() {
2738
502
                    focusAnimation.start()
914
                    if (state == "stagedRightEdge") {
2739
915
                        // TODO: Can we drop this if and find something that always works?
2740
916
                        if (root.mode == "staged") {
2741
917
                            rightEdgeFocusAnimation.targetX = 0
2742
918
                            rightEdgeFocusAnimation.start()
2743
919
                        } else if (root.mode == "stagedWithSideStage") {
2744
920
                            rightEdgeFocusAnimation.targetX = appDelegate.stage == ApplicationInfoInterface.SideStage ? sideStage.x : 0
2745
921
                            rightEdgeFocusAnimation.start()
2746
922
                        }
2747
923
                    } else if (state == "windowedRightEdge" || state == "windowed") {
2748
924
                        claimFocus();
2749
925
                    } else {
2750
926
                        focusAnimation.start()
2751
927
                    }
2752
928
                }
2753
929
                function playHidingAnimation() {
2754
930
                    if (state != "windowedRightEdge") {
2755
931
                        hidingAnimation.start()
2756
932
                    }
2757
933
                }
2758
934
2759
935
                function refreshStage() {
2760
936
                    var newStage = ApplicationInfoInterface.MainStage;
2761
937
                    if (priv.sideStageEnabled) { // we're in lanscape rotation.
2762
938
                        if (!isDash && application && application.supportedOrientations & (Qt.PortraitOrientation|Qt.InvertedPortraitOrientation)) {
2763
939
                            var defaultStage = ApplicationInfoInterface.SideStage; // if application supports portrait, it defaults to sidestage.
2764
940
                            if (application.supportedOrientations & (Qt.LandscapeOrientation|Qt.InvertedLandscapeOrientation)) {
2765
941
                                // if it supports lanscape, it defaults to mainstage.
2766
942
                                defaultStage = ApplicationInfoInterface.MainStage;
2767
943
                            }
2768
944
                            newStage = WindowStateStorage.getStage(application.appId, defaultStage);
2769
945
                        }
2770
946
                    }
2771
947
2772
948
                    stage = newStage;
2773
949
                    if (focus && stage == ApplicationInfoInterface.SideStage && !sideStage.shown) {
2774
950
                        sideStage.show();
2775
951
                    }
2776
503
                }
952
                }
2777
504
953
2778
505
                UbuntuNumberAnimation {
954
                UbuntuNumberAnimation {
2779
@@ -509,32 +958,255 @@
2780
509
                    from: 0.98
958
                    from: 0.98
2781
510
                    to: 1
959
                    to: 1
2782
511
                    duration: UbuntuAnimation.SnapDuration
960
                    duration: UbuntuAnimation.SnapDuration
2789
512
                }
961
                    onStarted: {
2790
513
962
                        topLevelSurfaceList.raiseId(model.id);
2791
514
                // unlike requestedX/Y, this is the last known grab position before being pushed against edges/corners
963
                    }
2792
515
                // when restoring, the window should return to these, not to the place where it was dropped near the edge
964
                    onStopped: {
2793
516
                property real restoredX
965
                        appDelegate.claimFocus();
2794
517
                property real restoredY
966
                    }
2795
967
                }
2796
968
                ParallelAnimation {
2797
969
                    id: rightEdgeFocusAnimation
2798
970
                    property int targetX: 0
2799
971
                    UbuntuNumberAnimation { target: appDelegate; properties: "x"; to: rightEdgeFocusAnimation.targetX; duration: priv.animationDuration }
2800
972
                    UbuntuNumberAnimation { target: decoratedWindow; properties: "angle"; to: 0; duration: priv.animationDuration }
2801
973
                    UbuntuNumberAnimation { target: decoratedWindow; properties: "itemScale"; to: 1; duration: priv.animationDuration }
2802
974
                    onStopped: {
2803
975
                        appDelegate.focus = true
2804
976
                    }
2805
977
                }
2806
978
                ParallelAnimation {
2807
979
                    id: hidingAnimation
2808
980
                    UbuntuNumberAnimation { target: appDelegate; property: "opacity"; to: 0; duration: priv.animationDuration }
2809
981
                    onStopped: appDelegate.opacity = 1
2810
982
                }
2811
983
2812
984
                SpreadMaths {
2813
985
                    id: spreadMaths
2814
986
                    spread: spreadItem
2815
987
                    itemIndex: index
2816
988
                    flickable: floatingFlickable
2817
989
                }
2818
990
                StageMaths {
2819
991
                    id: stageMaths
2820
992
                    sceneWidth: root.width
2821
993
                    stage: appDelegate.stage
2822
994
                    thisDelegate: appDelegate
2823
995
                    mainStageDelegate: priv.mainStageDelegate
2824
996
                    sideStageDelegate: priv.sideStageDelegate
2825
997
                    sideStageWidth: sideStage.panelWidth
2826
998
                    sideStageX: sideStage.x
2827
999
                    itemIndex: appDelegate.itemIndex
2828
1000
                    nextInStack: priv.nextInStack
2829
1001
                    leftEdgeDragProgress: root.leftEdgeDragProgress
2830
1002
                }
2831
1003
2832
1004
                StagedRightEdgeMaths {
2833
1005
                    id: stagedRightEdgeMaths
2834
1006
                    sceneWidth: appContainer.width - root.leftMargin
2835
1007
                    sceneHeight: appContainer.height
2836
1008
                    isMainStageApp: priv.mainStageDelegate == appDelegate
2837
1009
                    isSideStageApp: priv.sideStageDelegate == appDelegate
2838
1010
                    sideStageWidth: sideStage.width
2839
1011
                    sideStageOpen: sideStage.shown
2840
1012
                    itemIndex: index
2841
1013
                    nextInStack: priv.nextInStack
2842
1014
                    progress: 0
2843
1015
                    targetHeight: spreadItem.stackHeight
2844
1016
                    targetX: spreadMaths.targetX
2845
1017
                    startY: appDelegate.fullscreen ? 0 : PanelState.panelHeight
2846
1018
                    targetY: spreadMaths.targetY
2847
1019
                    targetAngle: spreadMaths.targetAngle
2848
1020
                    targetScale: spreadMaths.targetScale
2849
1021
                    shuffledZ: stageMaths.itemZ
2850
1022
                    breakPoint: spreadItem.rightEdgeBreakPoint
2851
1023
                }
2852
1024
2853
1025
                WindowedRightEdgeMaths {
2854
1026
                    id: windowedRightEdgeMaths
2855
1027
                    itemIndex: index
2856
1028
                    startWidth: appDelegate.requestedWidth
2857
1029
                    startHeight: appDelegate.requestedHeight
2858
1030
                    targetHeight: spreadItem.stackHeight
2859
1031
                    targetX: spreadMaths.targetX
2860
1032
                    targetY: spreadMaths.targetY
2861
1033
                    normalZ: appDelegate.normalZ
2862
1034
                    targetAngle: spreadMaths.targetAngle
2863
1035
                    targetScale: spreadMaths.targetScale
2864
1036
                    breakPoint: spreadItem.rightEdgeBreakPoint
2865
1037
                }
2866
518
1038
2867
519
                states: [
1039
                states: [
2868
520
                    State {
1040
                    State {
2869
1041
                        name: "spread"; when: root.state == "spread"
2870
1042
                        PropertyChanges {
2871
1043
                            target: decoratedWindow;
2872
1044
                            showDecoration: false;
2873
1045
                            angle: spreadMaths.targetAngle
2874
1046
                            itemScale: spreadMaths.targetScale
2875
1047
                            scaleToPreviewSize: spreadItem.stackHeight
2876
1048
                            scaleToPreviewProgress: 1
2877
1049
                            hasDecoration: root.mode === "windowed"
2878
1050
                            shadowOpacity: spreadMaths.shadowOpacity
2879
1051
                            showHighlight: spreadItem.highlightedIndex === index
2880
1052
                            darkening: spreadItem.highlightedIndex >= 0
2881
1053
                            anchors.topMargin: dragArea.distance
2882
1054
                        }
2883
1055
                        PropertyChanges {
2884
1056
                            target: appDelegate
2885
1057
                            x: spreadMaths.targetX
2886
1058
                            y: spreadMaths.targetY
2887
1059
                            z: index
2888
1060
                            height: spreadItem.spreadItemHeight
2889
1061
                            requestedWidth: decoratedWindow.oldRequestedWidth
2890
1062
                            requestedHeight: decoratedWindow.oldRequestedHeight
2891
1063
                            visible: spreadMaths.itemVisible
2892
1064
                        }
2893
1065
                        PropertyChanges { target: dragArea; enabled: true }
2894
1066
                        PropertyChanges { target: windowInfoItem; opacity: spreadMaths.tileInfoOpacity; visible: spreadMaths.itemVisible }
2895
1067
                    },
2896
1068
                    State {
2897
1069
                        name: "stagedRightEdge"
2898
1070
                        when: (root.mode == "staged" || root.mode == "stagedWithSideStage") && (root.state == "sideStagedRightEdge" || root.state == "stagedRightEdge" || rightEdgeFocusAnimation.running || hidingAnimation.running)
2899
1071
                        PropertyChanges {
2900
1072
                            target: stagedRightEdgeMaths
2901
1073
                            progress: Math.max(edgeBarrier.progress, rightEdgeDragArea.draggedProgress)
2902
1074
                        }
2903
1075
                        PropertyChanges {
2904
1076
                            target: appDelegate
2905
1077
                            x: stagedRightEdgeMaths.animatedX
2906
1078
                            y: stagedRightEdgeMaths.animatedY
2907
1079
                            z: stagedRightEdgeMaths.animatedZ
2908
1080
                            height: stagedRightEdgeMaths.animatedHeight
2909
1081
                            requestedWidth: decoratedWindow.oldRequestedWidth
2910
1082
                            requestedHeight: decoratedWindow.oldRequestedHeight
2911
1083
                            visible: appDelegate.x < root.width
2912
1084
                        }
2913
1085
                        PropertyChanges {
2914
1086
                            target: decoratedWindow
2915
1087
                            hasDecoration: false
2916
1088
                            angle: stagedRightEdgeMaths.animatedAngle
2917
1089
                            itemScale: stagedRightEdgeMaths.animatedScale
2918
1090
                            scaleToPreviewSize: spreadItem.stackHeight
2919
1091
                            scaleToPreviewProgress: stagedRightEdgeMaths.scaleToPreviewProgress
2920
1092
                            shadowOpacity: .3
2921
1093
                        }
2922
1094
                    },
2923
1095
                    State {
2924
1096
                        name: "windowedRightEdge"
2925
1097
                        when: root.mode == "windowed" && (root.state == "windowedRightEdge" || rightEdgeFocusAnimation.running || hidingAnimation.running || edgeBarrier.progress > 0)
2926
1098
                        PropertyChanges {
2927
1099
                            target: windowedRightEdgeMaths
2928
1100
                            progress: Math.max(rightEdgeDragArea.progress, edgeBarrier.progress)
2929
1101
                        }
2930
1102
                        PropertyChanges {
2931
1103
                            target: appDelegate
2932
1104
                            x: windowedRightEdgeMaths.animatedX
2933
1105
                            y: windowedRightEdgeMaths.animatedY
2934
1106
                            z: windowedRightEdgeMaths.animatedZ
2935
1107
                            height: stagedRightEdgeMaths.animatedHeight
2936
1108
                            requestedWidth: decoratedWindow.oldRequestedWidth
2937
1109
                            requestedHeight: decoratedWindow.oldRequestedHeight
2938
1110
                        }
2939
1111
                        PropertyChanges {
2940
1112
                            target: decoratedWindow
2941
1113
                            showDecoration: windowedRightEdgeMaths.decorationHeight
2942
1114
                            angle: windowedRightEdgeMaths.animatedAngle
2943
1115
                            itemScale: windowedRightEdgeMaths.animatedScale
2944
1116
                            scaleToPreviewSize: spreadItem.stackHeight
2945
1117
                            scaleToPreviewProgress: windowedRightEdgeMaths.scaleToPreviewProgress
2946
1118
                            shadowOpacity: .3
2947
1119
                        }
2948
1120
                        PropertyChanges {
2949
1121
                            target: opacityEffect;
2950
1122
                            opacityValue: windowedRightEdgeMaths.opacityMask
2951
1123
                            sourceItem: windowedRightEdgeMaths.opacityMask < 1 ? decoratedWindow : null
2952
1124
                        }
2953
1125
                    },
2954
1126
                    State {
2955
1127
                        name: "staged"; when: root.state == "staged"
2956
1128
                        PropertyChanges {
2957
1129
                            target: appDelegate
2958
1130
                            x: stageMaths.itemX
2959
1131
                            y: appDelegate.fullscreen ? 0 : PanelState.panelHeight
2960
1132
                            requestedWidth: appContainer.width
2961
1133
                            requestedHeight: appDelegate.fullscreen ? appContainer.height : appContainer.height - PanelState.panelHeight
2962
1134
                            visuallyMaximized: true
2963
1135
                            visible: appDelegate.x < root.width
2964
1136
                        }
2965
1137
                        PropertyChanges {
2966
1138
                            target: decoratedWindow
2967
1139
                            hasDecoration: false
2968
1140
                        }
2969
1141
                        PropertyChanges {
2970
1142
                            target: resizeArea
2971
1143
                            enabled: false
2972
1144
                        }
2973
1145
                        PropertyChanges {
2974
1146
                            target: stageMaths
2975
1147
                            animateX: !focusAnimation.running && itemIndex !== spreadItem.highlightedIndex
2976
1148
                        }
2977
1149
                    },
2978
1150
                    State {
2979
1151
                        name: "stagedWithSideStage"; when: root.state == "stagedWithSideStage"
2980
1152
                        PropertyChanges {
2981
1153
                            target: stageMaths
2982
1154
                            itemIndex: index
2983
1155
                        }
2984
1156
                        PropertyChanges {
2985
1157
                            target: appDelegate
2986
1158
                            x: stageMaths.itemX
2987
1159
                            y: appDelegate.fullscreen ? 0 : PanelState.panelHeight
2988
1160
                            z: stageMaths.itemZ
2989
1161
                            requestedWidth: stageMaths.itemWidth
2990
1162
                            requestedHeight: appDelegate.fullscreen ? appContainer.height : appContainer.height - PanelState.panelHeight
2991
1163
                            visuallyMaximized: true
2992
1164
                            visible: appDelegate.x < root.width
2993
1165
                        }
2994
1166
                        PropertyChanges {
2995
1167
                            target: decoratedWindow
2996
1168
                            hasDecoration: false
2997
1169
                        }
2998
1170
                        PropertyChanges {
2999
1171
                            target: resizeArea
3000
1172
                            enabled: false
3001
1173
                        }
3002
1174
                    },
3003
1175
                    State {
3004
1176
                        name: "maximized"; when: appDelegate.windowState == WindowStateStorage.WindowStateMaximized
3005
1177
                        PropertyChanges {
3006
1178
                            target: appDelegate;
3007
1179
                            requestedX: root.leftMargin;
3008
1180
                            requestedY: 0;
3009
1181
                            visuallyMinimized: false;
3010
1182
                            visuallyMaximized: true
3011
1183
                            requestedWidth: appContainer.width - root.leftMargin;
3012
1184
                            requestedHeight: appContainer.height;
3013
1185
                        }
3014
1186
                        PropertyChanges { target: touchControls; enabled: true }
3015
1187
                    },
3016
1188
                    State {
3017
521
                        name: "fullscreen"; when: appDelegate.fullscreen && !appDelegate.minimized
1189
                        name: "fullscreen"; when: appDelegate.fullscreen && !appDelegate.minimized
3018
522
                        PropertyChanges {
1190
                        PropertyChanges {
3019
523
                            target: appDelegate;
1191
                            target: appDelegate;
3022
524
                            x: rotation == 0 ? 0 : (parent.width - width) / 2 + (shellOrientationAngle == 90 ? -PanelState.panelHeight : PanelState.panelHeight)
1192
                            requestedX: 0
3023
525
                            y: rotation == 0 ? -PanelState.panelHeight : (parent.height - height) / 2
1193
                            requestedY: 0
3024
526
                            requestedWidth: appContainer.width;
1194
                            requestedWidth: appContainer.width;
3025
527
                            requestedHeight: appContainer.height;
1195
                            requestedHeight: appContainer.height;
3026
528
                        }
1196
                        }
3027
1197
                        PropertyChanges { target: decoratedWindow; hasDecoration: false }
3028
529
                    },
1198
                    },
3029
530
                    State {
1199
                    State {
3030
531
                        name: "normal";
1200
                        name: "normal";
3031
532
                        when: appDelegate.windowState == WindowStateStorage.WindowStateNormal
1201
                        when: appDelegate.windowState == WindowStateStorage.WindowStateNormal
3032
533
                        PropertyChanges {
1202
                        PropertyChanges {
3035
534
                            target: appDelegate;
1203
                            target: appDelegate
3036
535
                            visuallyMinimized: false;
1204
                            visuallyMinimized: false
3037
536
                            visuallyMaximized: false
1205
                            visuallyMaximized: false
3038
537
                        }
1206
                        }
3039
1207
                        PropertyChanges { target: touchControls; enabled: true }
3040
1208
                        PropertyChanges { target: resizeArea; enabled: true }
3041
1209
                        PropertyChanges { target: decoratedWindow; shadowOpacity: .3}
3042
538
                    },
1210
                    },
3043
539
                    State {
1211
                    State {
3044
540
                        name: "restored";
1212
                        name: "restored";
3045
@@ -542,30 +1214,25 @@
3046
542
                        extend: "normal"
1214
                        extend: "normal"
3047
543
                        PropertyChanges {
1215
                        PropertyChanges {
3048
544
                            target: appDelegate;
1216
                            target: appDelegate;
3051
545
                            requestedX: restoredX;
1217
                            windowedX: restoredX;
3052
546
                            requestedY: restoredY;
1218
                            windowedY: restoredY;
3053
547
                        }
1219
                        }
3054
548
                    },
1220
                    },
3055
549
                    State {
1221
                    State {
3066
550
                        name: "maximized"; when: appDelegate.maximized && !appDelegate.minimized
1222
                        name: "semiMaximized"
3067
551
                        PropertyChanges {
1223
                        PropertyChanges { target: touchControls; enabled: true }
3068
552
                            target: appDelegate;
1224
                        PropertyChanges { target: resizeArea; enabled: true }
3069
553
                            requestedX: root.leftMargin;
1225
                        PropertyChanges { target: decoratedWindow; shadowOpacity: .3 }
3060
554
                            requestedY: 0;
3061
555
                            requestedWidth: appContainer.width - root.leftMargin;
3062
556
                            requestedHeight: appContainer.height;
3063
557
                            visuallyMinimized: false;
3064
558
                            visuallyMaximized: true
3065
559
                        }
3070
560
                    },
1226
                    },
3071
561
                    State {
1227
                    State {
3072
562
                        name: "maximizedLeft"; when: appDelegate.maximizedLeft && !appDelegate.minimized
1228
                        name: "maximizedLeft"; when: appDelegate.maximizedLeft && !appDelegate.minimized
3073
1229
                        extend: "semiMaximized"
3074
563
                        PropertyChanges {
1230
                        PropertyChanges {
3075
564
                            target: appDelegate
1231
                            target: appDelegate
3080
565
                            requestedX: root.leftMargin
1232
                            windowedX: root.leftMargin
3081
566
                            requestedY: PanelState.panelHeight
1233
                            windowedY: PanelState.panelHeight
3082
567
                            requestedWidth: (appContainer.width - root.leftMargin)/2
1234
                            windowedWidth: (appContainer.width - root.leftMargin)/2
3083
568
                            requestedHeight: appContainer.height - PanelState.panelHeight
1235
                            windowedHeight: appContainer.height - PanelState.panelHeight
3084
569
                        }
1236
                        }
3085
570
                    },
1237
                    },
3086
571
                    State {
1238
                    State {
3087
@@ -573,17 +1240,18 @@
3088
573
                        extend: "maximizedLeft"
1240
                        extend: "maximizedLeft"
3089
574
                        PropertyChanges {
1241
                        PropertyChanges {
3090
575
                            target: appDelegate;
1242
                            target: appDelegate;
3092
576
                            requestedX: (appContainer.width + root.leftMargin)/2
1243
                            windowedX: (appContainer.width + root.leftMargin)/2
3093
577
                        }
1244
                        }
3094
578
                    },
1245
                    },
3095
579
                    State {
1246
                    State {
3096
580
                        name: "maximizedTopLeft"; when: appDelegate.maximizedTopLeft && !appDelegate.minimized
1247
                        name: "maximizedTopLeft"; when: appDelegate.maximizedTopLeft && !appDelegate.minimized
3097
1248
                        extend: "semiMaximized"
3098
581
                        PropertyChanges {
1249
                        PropertyChanges {
3099
582
                            target: appDelegate
1250
                            target: appDelegate
3104
583
                            requestedX: root.leftMargin
1251
                            windowedX: root.leftMargin
3105
584
                            requestedY: PanelState.panelHeight
1252
                            windowedY: PanelState.panelHeight
3106
585
                            requestedWidth: (appContainer.width - root.leftMargin)/2
1253
                            windowedWidth: (appContainer.width - root.leftMargin)/2
3107
586
                            requestedHeight: (appContainer.height - PanelState.panelHeight)/2
1254
                            windowedHeight: (appContainer.height - PanelState.panelHeight)/2
3108
587
                        }
1255
                        }
3109
588
                    },
1256
                    },
3110
589
                    State {
1257
                    State {
3111
@@ -591,17 +1259,18 @@
3112
591
                        extend: "maximizedTopLeft"
1259
                        extend: "maximizedTopLeft"
3113
592
                        PropertyChanges {
1260
                        PropertyChanges {
3114
593
                            target: appDelegate
1261
                            target: appDelegate
3116
594
                            requestedX: (appContainer.width + root.leftMargin)/2
1262
                            windowedX: (appContainer.width + root.leftMargin)/2
3117
595
                        }
1263
                        }
3118
596
                    },
1264
                    },
3119
597
                    State {
1265
                    State {
3120
598
                        name: "maximizedBottomLeft"; when: appDelegate.maximizedBottomLeft && !appDelegate.minimized
1266
                        name: "maximizedBottomLeft"; when: appDelegate.maximizedBottomLeft && !appDelegate.minimized
3121
1267
                        extend: "semiMaximized"
3122
599
                        PropertyChanges {
1268
                        PropertyChanges {
3123
600
                            target: appDelegate
1269
                            target: appDelegate
3128
601
                            requestedX: root.leftMargin
1270
                            windowedX: root.leftMargin
3129
602
                            requestedY: (appContainer.height + PanelState.panelHeight)/2
1271
                            windowedY: (appContainer.height + PanelState.panelHeight)/2
3130
603
                            requestedWidth: (appContainer.width - root.leftMargin)/2
1272
                            windowedWidth: (appContainer.width - root.leftMargin)/2
3131
604
                            requestedHeight: appContainer.height/2
1273
                            windowedHeight: appContainer.height/2
3132
605
                        }
1274
                        }
3133
606
                    },
1275
                    },
3134
607
                    State {
1276
                    State {
3135
@@ -609,35 +1278,52 @@
3136
609
                        extend: "maximizedBottomLeft"
1278
                        extend: "maximizedBottomLeft"
3137
610
                        PropertyChanges {
1279
                        PropertyChanges {
3138
611
                            target: appDelegate
1280
                            target: appDelegate
3140
612
                            requestedX: (appContainer.width + root.leftMargin)/2
1281
                            windowedX: (appContainer.width + root.leftMargin)/2
3141
613
                        }
1282
                        }
3142
614
                    },
1283
                    },
3143
615
                    State {
1284
                    State {
3144
616
                        name: "maximizedHorizontally"; when: appDelegate.maximizedHorizontally && !appDelegate.minimized
1285
                        name: "maximizedHorizontally"; when: appDelegate.maximizedHorizontally && !appDelegate.minimized
3146
617
                        PropertyChanges { target: appDelegate; requestedX: root.leftMargin; requestedY: requestedY; requestedWidth: appContainer.width - root.leftMargin }
1286
                        extend: "semiMaximized"
3147
1287
                        PropertyChanges { target: appDelegate; requestedX: root.leftMargin; requestedY: windowedY;
3148
1288
                            requestedWidth: appContainer.width - root.leftMargin; requestedHeight: appDelegate.windowedHeight }
3149
618
                    },
1289
                    },
3150
619
                    State {
1290
                    State {
3151
620
                        name: "maximizedVertically"; when: appDelegate.maximizedVertically && !appDelegate.minimized
1291
                        name: "maximizedVertically"; when: appDelegate.maximizedVertically && !appDelegate.minimized
3153
621
                        PropertyChanges { target: appDelegate; requestedX: requestedX; requestedY: PanelState.panelHeight; requestedHeight: appContainer.height - PanelState.panelHeight }
1292
                        extend: "semiMaximized"
3154
1293
                        PropertyChanges { target: appDelegate; requestedX: windowedX; requestedY: PanelState.panelHeight;
3155
1294
                            requestedWidth: appDelegate.windowedWidth; requestedHeight: appContainer.height - PanelState.panelHeight }
3156
622
                    },
1295
                    },
3157
623
                    State {
1296
                    State {
3158
624
                        name: "minimized"; when: appDelegate.minimized
1297
                        name: "minimized"; when: appDelegate.minimized
3159
625
                        PropertyChanges {
1298
                        PropertyChanges {
3163
626
                            target: appDelegate;
1299
                            target: appDelegate
3164
627
                            requestedX: -appDelegate.width / 2;
1300
                            requestedX: -appDelegate.width / 2
3165
628
                            scale: units.gu(5) / appDelegate.width;
1301
                            scale: units.gu(5) / appDelegate.width
3166
629
                            opacity: 0;
1302
                            opacity: 0;
3168
630
                            visuallyMinimized: true;
1303
                            visuallyMinimized: true
3169
631
                            visuallyMaximized: false
1304
                            visuallyMaximized: false
3170
632
                        }
1305
                        }
3171
633
                    }
1306
                    }
3172
634
                ]
1307
                ]
3173
635
                transitions: [
1308
                transitions: [
3174
636
                    Transition {
1309
                    Transition {
3175
1310
                        from: "staged,stagedWithSideStage"; to: "normal"
3176
1311
                        enabled: appDelegate.animationsEnabled
3177
1312
                        PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
3178
1313
                        UbuntuNumberAnimation { target: appDelegate; properties: "x,y,requestedX,requestedY,opacity,requestedWidth,requestedHeight,scale"; duration: priv.animationDuration }
3179
1314
                    },
3180
1315
                    Transition {
3181
1316
                        from: "normal,maximized,maximizedHorizontally,maximizedVertically,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedBottomLeft,maximizedTopRight,maximizedBottomRight";
3182
1317
                        to: "staged,stagedWithSideStage"
3183
1318
                        UbuntuNumberAnimation { target: appDelegate; properties: "x,y,requestedX,requestedY,requestedWidth,requestedHeight"; duration: priv.animationDuration}
3184
1319
                    },
3185
1320
                    Transition {
3186
1321
                        from: "maximized,maximizedHorizontally,maximizedVertically,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedBottomLeft,maximizedTopRight,maximizedBottomRight,minimized";
3187
637
                        to: "normal,restored"
1322
                        to: "normal,restored"
3188
638
                        enabled: appDelegate.animationsEnabled
1323
                        enabled: appDelegate.animationsEnabled
3189
639
                        PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
1324
                        PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
3191
640
                        UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,opacity,scale,requestedWidth,requestedHeight" }
1325
                        UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,windowedX,windowedY,requestedWidth,requestedHeight,windowedWidth,windowedHeight,scale";
3192
1326
                            duration: priv.animationDuration }
3193
641
                    },
1327
                    },
3194
642
                    Transition {
1328
                    Transition {
3195
643
                        to: "minimized"
1329
                        to: "minimized"
3196
@@ -657,11 +1343,60 @@
3197
657
                        }
1343
                        }
3198
658
                    },
1344
                    },
3199
659
                    Transition {
1345
                    Transition {
3201
660
                        to: "*" //maximized and fullscreen
1346
                        to: "spread"
3202
1347
                        // DecoratedWindow wants the scaleToPreviewSize set before enabling scaleToPreview
3203
1348
                        PropertyAction { target: appDelegate; properties: "z,visible" }
3204
1349
                        PropertyAction { target: decoratedWindow; property: "scaleToPreviewSize" }
3205
1350
                        UbuntuNumberAnimation { target: appDelegate; properties: "x,y,height"; duration: priv.animationDuration }
3206
1351
                        UbuntuNumberAnimation { target: decoratedWindow; properties: "width,height,itemScale,angle,scaleToPreviewProgress"; duration: priv.animationDuration }
3207
1352
                    },
3208
1353
                    Transition {
3209
1354
                        from: "normal,staged"; to: "stagedWithSideStage"
3210
1355
                        UbuntuNumberAnimation { target: appDelegate; properties: "x,y"; duration: priv.animationDuration }
3211
1356
                        UbuntuNumberAnimation { target: appDelegate; properties: "requestedWidth,requestedHeight"; duration: priv.animationDuration }
3212
1357
                    },
3213
1358
                    Transition {
3214
1359
                        to: "windowedRightEdge"
3215
1360
                        ScriptAction {
3216
1361
                            script: {
3217
1362
                                windowedRightEdgeMaths.startX = appDelegate.requestedX
3218
1363
                                windowedRightEdgeMaths.startY = appDelegate.requestedY
3219
1364
3220
1365
                                if (index == 1) {
3221
1366
                                    var thisRect = { x: appDelegate.windowedX, y: appDelegate.windowedY, width: appDelegate.requestedWidth, height: appDelegate.requestedHeight }
3222
1367
                                    var otherDelegate = appRepeater.itemAt(0);
3223
1368
                                    var otherRect = { x: otherDelegate.windowedX, y: otherDelegate.windowedY, width: otherDelegate.requestedWidth, height: otherDelegate.requestedHeight }
3224
1369
                                    var intersectionRect = MathUtils.intersectionRect(thisRect, otherRect)
3225
1370
                                    var mappedInterSectionRect = appDelegate.mapFromItem(root, intersectionRect.x, intersectionRect.y)
3226
1371
                                    opacityEffect.maskX = mappedInterSectionRect.x
3227
1372
                                    opacityEffect.maskY = mappedInterSectionRect.y
3228
1373
                                    opacityEffect.maskWidth = intersectionRect.width
3229
1374
                                    opacityEffect.maskHeight = intersectionRect.height
3230
1375
                                }
3231
1376
                            }
3232
1377
                        }
3233
1378
                    },
3234
1379
                    Transition {
3235
1380
                        from: "stagedRightEdge"; to: "staged"
3236
1381
                        enabled: rightEdgeDragArea.cancelled // only transition back to state if the gesture was cancelled, in the other cases we play the focusAnimations.
3237
1382
                        SequentialAnimation {
3238
1383
                            ParallelAnimation {
3239
1384
                                UbuntuNumberAnimation { target: appDelegate; properties: "x,y,height,width,scale"; duration: priv.animationDuration }
3240
1385
                                UbuntuNumberAnimation { target: decoratedWindow; properties: "width,height,itemScale,angle,scaleToPreviewProgress"; duration: priv.animationDuration }
3241
1386
                            }
3242
1387
                            // We need to release scaleToPreviewSize at last
3243
1388
                            PropertyAction { target: decoratedWindow; property: "scaleToPreviewSize" }
3244
1389
                            PropertyAction { target: appDelegate; property: "visible" }
3245
1390
                        }
3246
1391
                    },
3247
1392
                    Transition {
3248
1393
                        from: "normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTop,maximizedBottom,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"
3249
1394
                        to: "normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTop,maximizedBottom,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"
3250
661
                        enabled: appDelegate.animationsEnabled
1395
                        enabled: appDelegate.animationsEnabled
3251
662
                        PropertyAction { target: appDelegate; property: "visuallyMinimized" }
3252
663
                        SequentialAnimation {
1396
                        SequentialAnimation {
3254
664
                            UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,opacity,scale,requestedWidth,requestedHeight" }
1397
                            PropertyAction { target: appDelegate; property: "visuallyMinimized" }
3255
1398
                            UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,windowedX,windowedY,opacity,scale,requestedWidth,requestedHeight,windowedWidth,windowedHeight";
3256
1399
                                duration: priv.animationDuration }
3257
665
                            PropertyAction { target: appDelegate; property: "visuallyMaximized" }
1400
                            PropertyAction { target: appDelegate; property: "visuallyMaximized" }
3258
666
                            ScriptAction { script: { fakeRectangle.stop(); } }
1401
                            ScriptAction { script: { fakeRectangle.stop(); } }
3259
667
                        }
1402
                        }
3260
@@ -669,14 +1404,6 @@
3261
669
                ]
1404
                ]
3262
670
1405
3263
671
                Binding {
1406
                Binding {
3264
672
                    id: previewBinding
3265
673
                    target: appDelegate
3266
674
                    property: "z"
3267
675
                    value: topLevelSurfaceList.count + 1
3268
676
                    when: index == spread.highlightedIndex && spread.ready
3269
677
                }
3270
678
3271
679
                Binding {
3272
680
                    target: PanelState
1407
                    target: PanelState
3273
681
                    property: "buttonsAlwaysVisible"
1408
                    property: "buttonsAlwaysVisible"
3274
682
                    value: appDelegate && appDelegate.maximized && touchControls.overlayShown
1409
                    value: appDelegate && appDelegate.maximized && touchControls.overlayShown
3275
@@ -697,26 +1424,15 @@
3276
697
                    screenWidth: appContainer.width
1424
                    screenWidth: appContainer.width
3277
698
                    screenHeight: appContainer.height
1425
                    screenHeight: appContainer.height
3278
699
                    leftMargin: root.leftMargin
1426
                    leftMargin: root.leftMargin
3295
700
1427
                    enabled: false
3296
701
                    onPressed: { appDelegate.focus = true; }
1428
                    visible: enabled
3297
702
1429
3298
703
                    Component.onCompleted: {
1430
                    onPressed: {
3299
704
                        loadWindowState();
1431
                        appDelegate.focus = true;
3300
705
                    }
1432
                    }
3301
706
1433
3286
707
                    property bool saveStateOnDestruction: true
3287
708
                    Connections {
3288
709
                        target: root
3289
710
                        onStageAboutToBeUnloaded: {
3290
711
                            resizeArea.saveWindowState();
3291
712
                            resizeArea.saveStateOnDestruction = false;
3292
713
                            fullscreenPolicy.active = false;
3293
714
                        }
3294
715
                    }
3302
716
                    Component.onDestruction: {
1434
                    Component.onDestruction: {
3306
717
                        if (saveStateOnDestruction) {
1435
                        saveWindowState();
3304
718
                            saveWindowState();
3305
719
                        }
3307
720
                    }
1436
                    }
3308
721
                }
1437
                }
3309
722
1438
3310
@@ -729,14 +1445,25 @@
3311
729
                    surface: model.surface
1445
                    surface: model.surface
3312
730
                    active: appDelegate.focus
1446
                    active: appDelegate.focus
3313
731
                    focus: true
1447
                    focus: true
3314
1448
                    interactive: root.interactive
3315
1449
                    showDecoration: 1
3316
732
                    maximizeButtonShown: appDelegate.canBeMaximized
1450
                    maximizeButtonShown: appDelegate.canBeMaximized
3317
733
                    overlayShown: touchControls.overlayShown
1451
                    overlayShown: touchControls.overlayShown
3318
1452
                    width: implicitWidth
3319
1453
                    height: implicitHeight
3320
1454
                    highlightSize: windowInfoItem.iconMargin / 2
3321
734
                    stageWidth: appContainer.width
1455
                    stageWidth: appContainer.width
3322
735
                    stageHeight: appContainer.height
1456
                    stageHeight: appContainer.height
3323
736
1457
3324
737
                    requestedWidth: appDelegate.requestedWidth
1458
                    requestedWidth: appDelegate.requestedWidth
3325
738
                    requestedHeight: appDelegate.requestedHeight
1459
                    requestedHeight: appDelegate.requestedHeight
3326
739
1460
3327
1461
                    property int oldRequestedWidth: -1
3328
1462
                    property int oldRequestedHeight: -1
3329
1463
3330
1464
                    onRequestedWidthChanged: oldRequestedWidth = requestedWidth
3331
1465
                    onRequestedHeightChanged: oldRequestedHeight = requestedHeight
3332
1466
3333
740
                    onCloseClicked: { appDelegate.close(); }
1467
                    onCloseClicked: { appDelegate.close(); }
3334
741
                    onMaximizeClicked: appDelegate.anyMaximized ? appDelegate.restoreFromMaximized() : appDelegate.maximize();
1468
                    onMaximizeClicked: appDelegate.anyMaximized ? appDelegate.restoreFromMaximized() : appDelegate.maximize();
3335
742
                    onMaximizeHorizontallyClicked: appDelegate.maximizedHorizontally ? appDelegate.restoreFromMaximized() : appDelegate.maximizeHorizontally()
1469
                    onMaximizeHorizontallyClicked: appDelegate.maximizedHorizontally ? appDelegate.restoreFromMaximized() : appDelegate.maximizeHorizontally()
3336
@@ -744,11 +1471,34 @@
3337
744
                    onMinimizeClicked: appDelegate.minimize()
1471
                    onMinimizeClicked: appDelegate.minimize()
3338
745
                    onDecorationPressed: { appDelegate.focus = true; }
1472
                    onDecorationPressed: { appDelegate.focus = true; }
3339
746
                    onDecorationReleased: fakeRectangle.commit();
1473
                    onDecorationReleased: fakeRectangle.commit();
3340
1474
3341
1475
                    property real angle: 0
3342
1476
                    property real itemScale: 1
3343
1477
                    transform: [
3344
1478
                        Scale {
3345
1479
                            origin.x: 0
3346
1480
                            origin.y: decoratedWindow.implicitHeight / 2
3347
1481
                            xScale: decoratedWindow.itemScale
3348
1482
                            yScale: decoratedWindow.itemScale
3349
1483
                        },
3350
1484
                        Rotation {
3351
1485
                            origin { x: 0; y: (decoratedWindow.height / 2) }
3352
1486
                            axis { x: 0; y: 1; z: 0 }
3353
1487
                            angle: decoratedWindow.angle
3354
1488
                        }
3355
1489
                    ]
3356
1490
                }
3357
1491
3358
1492
                OpacityMask {
3359
1493
                    id: opacityEffect
3360
1494
                    anchors.fill: decoratedWindow
3361
747
                }
1495
                }
3362
748
1496
3363
749
                WindowControlsOverlay {
1497
                WindowControlsOverlay {
3364
750
                    id: touchControls
1498
                    id: touchControls
3365
751
                    target: appDelegate
1499
                    target: appDelegate
3366
1500
                    enabled: false
3367
1501
                    visible: enabled
3368
752
                    stageWidth: appContainer.width
1502
                    stageWidth: appContainer.width
3369
753
                    stageHeight: appContainer.height
1503
                    stageHeight: appContainer.height
3370
754
1504
3371
@@ -764,9 +1514,89 @@
3372
764
                }
1514
                }
3373
765
1515
3374
766
                WindowedFullscreenPolicy {
1516
                WindowedFullscreenPolicy {
3378
767
                    id: fullscreenPolicy
1517
                    id: windowedFullscreenPolicy
3379
768
                    active: true
1518
                    active: root.mode == "windowed"
3380
769
                    surface: model.surface
1519
                    surface: model.surface
3381
1520
                }
3382
1521
                StagedFullscreenPolicy {
3383
1522
                    id: stagedFullscreenPolicy
3384
1523
                    active: root.mode == "staged" || root.mode == "stagedWithSideStage"
3385
1524
                    surface: model.surface
3386
1525
                }
3387
1526
3388
1527
                SpreadDelegateInputArea {
3389
1528
                    id: dragArea
3390
1529
                    objectName: "dragArea"
3391
1530
                    anchors.fill: decoratedWindow
3392
1531
                    enabled: false
3393
1532
                    closeable: !appDelegate.isDash
3394
1533
3395
1534
                    onClicked: {
3396
1535
                        spreadItem.highlightedIndex = index;
3397
1536
                        if (distance == 0) {
3398
1537
                            priv.goneToSpread = false;
3399
1538
                        }
3400
1539
                    }
3401
1540
                    onClose: {
3402
1541
                        priv.closingIndex = index
3403
1542
                        if (model.surface) { // could be stopped by OOM
3404
1543
                            model.surface.close()
3405
1544
                        } else if (model.application) {
3406
1545
                            root.applicationManager.stopApplication(model.application.appId);
3407
1546
                        }
3408
1547
                    }
3409
1548
                }
3410
1549
3411
1550
                WindowInfoItem {
3412
1551
                    id: windowInfoItem
3413
1552
                    objectName: "windowInfoItem"
3414
1553
                    anchors { left: parent.left; top: decoratedWindow.bottom; topMargin: units.gu(1) }
3415
1554
                    title: model.application.name
3416
1555
                    iconSource: model.application.icon
3417
1556
                    height: spreadItem.appInfoHeight
3418
1557
                    opacity: 0
3419
1558
                    z: 1
3420
1559
                    visible: opacity > 0
3421
1560
                    maxWidth: {
3422
1561
                        var nextApp = appRepeater.itemAt(index + 1);
3423
1562
                        if (nextApp) {
3424
1563
                            return nextApp.x - appDelegate.x - units.gu(1)
3425
1564
                        }
3426
1565
                        return appDelegate.width;
3427
1566
                    }
3428
1567
3429
1568
                    onClicked: {
3430
1569
                        spreadItem.highlightedIndex = index;
3431
1570
                        priv.goneToSpread = false;
3432
1571
                    }
3433
1572
                }
3434
1573
3435
1574
                Image {
3436
1575
                    id: closeImage
3437
1576
                    anchors { left: parent.left; top: parent.top; leftMargin: -height / 2; topMargin: -height / 2 + spreadMaths.closeIconOffset }
3438
1577
                    source: "graphics/window-close.svg"
3439
1578
                    readonly property var mousePos: hoverMouseArea.mapToItem(appDelegate, hoverMouseArea.mouseX, hoverMouseArea.mouseY)
3440
1579
                    visible: !appDelegate.isDash && dragArea.distance == 0
3441
1580
                             && index == spreadItem.highlightedIndex
3442
1581
                             && mousePos.y < (decoratedWindow.height / 3)
3443
1582
                             && mousePos.y > -units.gu(4)
3444
1583
                             && mousePos.x > -units.gu(4)
3445
1584
                             && mousePos.x < (decoratedWindow.width * 2 / 3)
3446
1585
                    height: units.gu(2)
3447
1586
                    width: height
3448
1587
                    sourceSize.width: width
3449
1588
                    sourceSize.height: height
3450
1589
3451
1590
                    MouseArea {
3452
1591
                        id: closeMouseArea
3453
1592
                        objectName: "closeMouseArea"
3454
1593
                        anchors.fill: closeImage
3455
1594
                        anchors.margins: -units.gu(2)
3456
1595
                        onClicked: {
3457
1596
                            priv.closingIndex = index;
3458
1597
                            appDelegate.close();
3459
1598
                        }
3460
1599
                    }
3461
770
                }
1600
                }
3462
771
            }
1601
            }
3463
772
        }
1602
        }
3464
@@ -786,7 +1616,8 @@
3465
786
        // NB: it does its own positioning according to the specified edge
1616
        // NB: it does its own positioning according to the specified edge
3466
787
        edge: Qt.RightEdge
1617
        edge: Qt.RightEdge
3467
788
1618
3469
789
        onPassed: { spread.show(); }
1619
        onPassed: priv.goneToSpread = true;
3470
1620
3471
790
        material: Component {
1621
        material: Component {
3472
791
            Item {
1622
            Item {
3473
792
                Rectangle {
1623
                Rectangle {
3474
@@ -803,23 +1634,248 @@
3475
803
        }
1634
        }
3476
804
    }
1635
    }
3477
805
1636
3478
1637
    MouseArea {
3479
1638
        id: hoverMouseArea
3480
1639
        objectName: "hoverMouseArea"
3481
1640
        anchors.fill: appContainer
3482
1641
        propagateComposedEvents: true
3483
1642
        hoverEnabled: true
3484
1643
        enabled: false
3485
1644
        visible: enabled
3486
1645
3487
1646
        property int scrollAreaWidth: width / 3
3488
1647
        property bool progressiveScrollingEnabled: false
3489
1648
3490
1649
        onMouseXChanged: {
3491
1650
            mouse.accepted = false
3492
1651
3493
1652
            if (hoverMouseArea.pressed) {
3494
1653
                return;
3495
1654
            }
3496
1655
3497
1656
            // Find the hovered item and mark it active
3498
1657
            var mapped = mapToItem(appContainer, hoverMouseArea.mouseX, hoverMouseArea.mouseY)
3499
1658
            var itemUnder = appContainer.childAt(mapped.x, mapped.y)
3500
1659
            if (itemUnder) {
3501
1660
                mapped = mapToItem(itemUnder, hoverMouseArea.mouseX, hoverMouseArea.mouseY)
3502
1661
                var delegateChild = itemUnder.childAt(mapped.x, mapped.y)
3503
1662
                if (delegateChild && (delegateChild.objectName === "dragArea" || delegateChild.objectName === "windowInfoItem")) {
3504
1663
                    spreadItem.highlightedIndex = appRepeater.indexOf(itemUnder)
3505
1664
                }
3506
1665
            }
3507
1666
3508
1667
            if (floatingFlickable.contentWidth > floatingFlickable.width) {
3509
1668
                var margins = floatingFlickable.width * 0.05;
3510
1669
3511
1670
                if (!progressiveScrollingEnabled && mouseX < floatingFlickable.width - scrollAreaWidth) {
3512
1671
                    progressiveScrollingEnabled = true
3513
1672
                }
3514
1673
3515
1674
                // do we need to scroll?
3516
1675
                if (mouseX < scrollAreaWidth + margins) {
3517
1676
                    var progress = Math.min(1, (scrollAreaWidth + margins - mouseX) / (scrollAreaWidth - margins));
3518
1677
                    var contentX = (1 - progress) * (floatingFlickable.contentWidth - floatingFlickable.width)
3519
1678
                    floatingFlickable.contentX = Math.max(0, Math.min(floatingFlickable.contentX, contentX))
3520
1679
                }
3521
1680
                if (mouseX > floatingFlickable.width - scrollAreaWidth && progressiveScrollingEnabled) {
3522
1681
                    var progress = Math.min(1, (mouseX - (floatingFlickable.width - scrollAreaWidth)) / (scrollAreaWidth - margins))
3523
1682
                    var contentX = progress * (floatingFlickable.contentWidth - floatingFlickable.width)
3524
1683
                    floatingFlickable.contentX = Math.min(floatingFlickable.contentWidth - floatingFlickable.width, Math.max(floatingFlickable.contentX, contentX))
3525
1684
                }
3526
1685
            }
3527
1686
        }
3528
1687
3529
1688
        onPressed: mouse.accepted = false
3530
1689
    }
3531
1690
3532
1691
    FloatingFlickable {
3533
1692
        id: floatingFlickable
3534
1693
        objectName: "spreadFlickable"
3535
1694
        anchors.fill: appContainer
3536
1695
        enabled: false
3537
1696
        contentWidth: spreadItem.spreadTotalWidth
3538
1697
3539
1698
        function snap(toIndex) {
3540
1699
            var delegate = appRepeater.itemAt(toIndex)
3541
1700
            var targetContentX = floatingFlickable.contentWidth / spreadItem.totalItemCount * toIndex;
3542
1701
            if (targetContentX - floatingFlickable.contentX > spreadItem.rightStackXPos - (spreadItem.spreadItemWidth / 2)) {
3543
1702
                var offset = (spreadItem.rightStackXPos - (spreadItem.spreadItemWidth / 2)) - (targetContentX - floatingFlickable.contentX)
3544
1703
                snapAnimation.to = floatingFlickable.contentX - offset;
3545
1704
                snapAnimation.start();
3546
1705
            } else if (targetContentX - floatingFlickable.contentX < spreadItem.leftStackXPos + units.gu(1)) {
3547
1706
                var offset = (spreadItem.leftStackXPos + units.gu(1)) - (targetContentX - floatingFlickable.contentX);
3548
1707
                snapAnimation.to = floatingFlickable.contentX - offset;
3549
1708
                snapAnimation.start();
3550
1709
            }
3551
1710
        }
3552
1711
        UbuntuNumberAnimation {id: snapAnimation; target: floatingFlickable; property: "contentX"}
3553
1712
    }
3554
1713
3555
1714
    PropertyAnimation {
3556
1715
        id: shortRightEdgeSwipeAnimation
3557
1716
        property: "x"
3558
1717
        to: 0
3559
1718
        duration: priv.animationDuration
3560
1719
    }
3561
1720
3562
806
    SwipeArea {
1721
    SwipeArea {
3563
1722
        id: rightEdgeDragArea
3564
1723
        objectName: "rightEdgeDragArea"
3565
807
        direction: Direction.Leftwards
1724
        direction: Direction.Leftwards
3566
808
        anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
1725
        anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
3569
809
        width: units.gu(1)
1726
        width: root.dragAreaWidth
3570
810
        onDraggingChanged: { if (dragging) { spread.show(); } }
1727
3571
1728
        property var gesturePoints: []
3572
1729
        property bool cancelled: false
3573
1730
3574
1731
        property real progress: dragging ? -touchPosition.x / root.width : 0
3575
1732
        onProgressChanged: {
3576
1733
            if (dragging) {
3577
1734
                draggedProgress = progress;
3578
1735
            }
3579
1736
        }
3580
1737
3581
1738
        property real draggedProgress: 0
3582
1739
3583
1740
        onTouchPositionChanged: {
3584
1741
            gesturePoints.push(touchPosition.x);
3585
1742
            if (gesturePoints.length > 10) {
3586
1743
                gesturePoints.splice(0, gesturePoints.length - 10)
3587
1744
            }
3588
1745
        }
3589
1746
3590
1747
        onDraggingChanged: {
3591
1748
            if (dragging) {
3592
1749
                // A potential edge-drag gesture has started. Start recording it
3593
1750
                gesturePoints = [];
3594
1751
                cancelled = false;
3595
1752
                draggedProgress = 0;
3596
1753
            } else {
3597
1754
                // Ok. The user released. Did he drag far enough to go to full spread?
3598
1755
                if (gesturePoints[gesturePoints.length - 1] < -spreadItem.rightEdgeBreakPoint * spreadItem.width ) {
3599
1756
3600
1757
                    // He dragged far enough, but if the last movement was a flick to the right again, he wants to cancel the spread again.
3601
1758
                    var oneWayFlickToRight = true;
3602
1759
                    var smallestX = gesturePoints[0]-1;
3603
1760
                    for (var i = 0; i < gesturePoints.length; i++) {
3604
1761
                        if (gesturePoints[i] <= smallestX) {
3605
1762
                            oneWayFlickToRight = false;
3606
1763
                            break;
3607
1764
                        }
3608
1765
                        smallestX = gesturePoints[i];
3609
1766
                    }
3610
1767
3611
1768
                    if (!oneWayFlickToRight) {
3612
1769
                        // Ok, the user made it, let's go to spread!
3613
1770
                        priv.goneToSpread = true;
3614
1771
                    } else {
3615
1772
                        cancelled = true;
3616
1773
                    }
3617
1774
                } else {
3618
1775
                    // Ok, the user didn't drag far enough to cross the breakPoint
3619
1776
                    // Find out if it was a one-way movement to the left, in which case we just switch directly to next app.
3620
1777
                    var oneWayFlick = true;
3621
1778
                    var smallestX = rightEdgeDragArea.width;
3622
1779
                    for (var i = 0; i < gesturePoints.length; i++) {
3623
1780
                        if (gesturePoints[i] >= smallestX) {
3624
1781
                            oneWayFlick = false;
3625
1782
                            break;
3626
1783
                        }
3627
1784
                        smallestX = gesturePoints[i];
3628
1785
                    }
3629
1786
3630
1787
                    if (appRepeater.count > 1 &&
3631
1788
                            (oneWayFlick && rightEdgeDragArea.distance > units.gu(2) || rightEdgeDragArea.distance > spreadItem.rightEdgeBreakPoint * spreadItem.width)) {
3632
1789
                        var nextStage = appRepeater.itemAt(priv.nextInStack).stage
3633
1790
                        for (var i = 0; i < appRepeater.count; i++) {
3634
1791
                            if (i != priv.nextInStack && appRepeater.itemAt(i).stage == nextStage) {
3635
1792
                                appRepeater.itemAt(i).playHidingAnimation()
3636
1793
                                break;
3637
1794
                            }
3638
1795
                        }
3639
1796
                        appRepeater.itemAt(priv.nextInStack).playFocusAnimation()
3640
1797
                        if (appRepeater.itemAt(priv.nextInStack).stage == ApplicationInfoInterface.SideStage && !sideStage.shown) {
3641
1798
                            sideStage.show();
3642
1799
                        }
3643
1800
3644
1801
                    } else {
3645
1802
                        cancelled = true;
3646
1803
                    }
3647
1804
3648
1805
                    gesturePoints = [];
3649
1806
                }
3650
1807
            }
3651
1808
        }
3652
811
    }
1809
    }
3653
812
1810
3664
813
    DesktopSpread {
1811
    TabletSideStageTouchGesture {
3665
814
        id: spread
1812
        id: triGestureArea
3666
815
        objectName: "spread"
1813
        objectName: "triGestureArea"
3667
816
        anchors.fill: appContainer
1814
        anchors.fill: parent
3668
817
        workspace: appContainer
1815
        enabled: false
3669
818
        focus: state == "altTab"
1816
        property Item appDelegate
3670
819
        altTabPressed: root.altTabPressed
1817
3671
820
1818
        dragComponent: dragComponent
3672
821
        onPlayFocusAnimation: {
1819
        dragComponentProperties: { "appDelegate": appDelegate }
3673
822
            appRepeater.itemAt(index).playFocusAnimation();
1820
3674
1821
        onPressed: {
3675
1822
            function matchDelegate(obj) { return String(obj.objectName).indexOf("appDelegate") >= 0; }
3676
1823
3677
1824
            var delegateAtCenter = Functions.itemAt(appContainer, x, y, matchDelegate);
3678
1825
            if (!delegateAtCenter) return;
3679
1826
3680
1827
            appDelegate = delegateAtCenter;
3681
1828
        }
3682
1829
3683
1830
        onClicked: {
3684
1831
            if (sideStage.shown) {
3685
1832
                sideStage.hide();
3686
1833
            } else  {
3687
1834
                sideStage.show();
3688
1835
                priv.updateMainAndSideStageIndexes()
3689
1836
            }
3690
1837
        }
3691
1838
3692
1839
        onDragStarted: {
3693
1840
            // If we're dragging to the sidestage.
3694
1841
            if (!sideStage.shown) {
3695
1842
                sideStage.show();
3696
1843
            }
3697
1844
        }
3698
1845
3699
1846
        Component {
3700
1847
            id: dragComponent
3701
1848
            SurfaceContainer {
3702
1849
                property Item appDelegate
3703
1850
3704
1851
                surface: appDelegate ? appDelegate.surface : null
3705
1852
3706
1853
                consumesInput: false
3707
1854
                interactive: false
3708
1855
                focus: false
3709
1856
                requestedWidth: appDelegate.requestedWidth
3710
1857
                requestedHeight: appDelegate.requestedHeight
3711
1858
3712
1859
                width: units.gu(40)
3713
1860
                height: units.gu(40)
3714
1861
3715
1862
                Drag.hotSpot.x: width/2
3716
1863
                Drag.hotSpot.y: height/2
3717
1864
                // only accept opposite stage.
3718
1865
                Drag.keys: {
3719
1866
                    if (!surface) return "Disabled";
3720
1867
                    if (appDelegate.isDash) return "Disabled";
3721
1868
3722
1869
                    if (appDelegate.stage === ApplicationInfo.MainStage) {
3723
1870
                        if (appDelegate.application.supportedOrientations
3724
1871
                                & (Qt.PortraitOrientation|Qt.InvertedPortraitOrientation)) {
3725
1872
                            return "MainStage";
3726
1873
                        }
3727
1874
                        return "Disabled";
3728
1875
                    }
3729
1876
                    return "SideStage";
3730
1877
                }
3731
1878
            }
3732
823
        }
1879
        }
3733
824
    }
1880
    }
3734
825
}
1881
}
3735
826
1882
3736
=== added file 'qml/Stage/StageMaths.qml'
3737
--- qml/Stage/StageMaths.qml	1970-01-01 00:00:00 +0000
3738
+++ qml/Stage/StageMaths.qml	2016-10-11 21:49:13 +0000
3739
@@ -0,0 +1,79 @@
3740
1
import QtQuick 2.4
3741
2
import Unity.Application 0.1
3742
3
import Ubuntu.Components 1.3
3743
4
3744
5
QtObject {
3745
6
    id: root
3746
7
3747
8
    // input
3748
9
    property int itemIndex: 0
3749
10
    property int nextInStack: 0
3750
11
    property int sceneWidth: 0
3751
12
    property int sideStageWidth: 0
3752
13
    property int sideStageX: sceneWidth
3753
14
    property bool animateX: false
3754
15
    property int leftEdgeDragProgress: 0
3755
16
3756
17
    property int stage: ApplicationInfoInterface.MainStage
3757
18
    property var thisDelegate: null
3758
19
    property var mainStageDelegate: null
3759
20
    property var sideStageDelegate: null
3760
21
3761
22
    // output
3762
23
3763
24
    // We need to shuffle z ordering a bit in order to keep side stage apps above main stage apps.
3764
25
    // We don't want to really reorder them in the model because that allows us to keep track
3765
26
    // of the last focused order.
3766
27
    readonly property int itemZ: {
3767
28
        // only shuffle when we've got a main and side stage
3768
29
        if (thisDelegate.isDash && thisDelegate != mainStageDelegate && leftEdgeDragProgress > 0) {
3769
30
            return -1; // Keep the dash behind all other apps for the left edge gesture
3770
31
        }
3771
32
3772
33
        if (!sideStageDelegate) return itemIndex;
3773
34
3774
35
        // don't shuffle indexes greater than "actives or next"
3775
36
        if (itemIndex > 2) return itemIndex;
3776
37
3777
38
        if (thisDelegate == mainStageDelegate) {
3778
39
            // Active main stage always at 0
3779
40
            return 0;
3780
41
        }
3781
42
3782
43
        if (nextInStack > 0) {
3783
44
            var stageOfNextInStack = appRepeater.itemAt(nextInStack).stage;
3784
45
3785
46
            if (itemIndex === nextInStack) {
3786
47
                // this is the next app in stack.
3787
48
3788
49
                if (stage ===  ApplicationInfoInterface.SideStage) {
3789
50
                    // if the next app in stack is a sidestage app, it must order on top of other side stage app
3790
51
                    return Math.min(2, topLevelSurfaceList.count-1);
3791
52
                }
3792
53
                return 1;
3793
54
            }
3794
55
            if (stageOfNextInStack === ApplicationInfoInterface.SideStage) {
3795
56
                // if the next app in stack is a sidestage app, it must order on top of other side stage app
3796
57
                return 1;
3797
58
            }
3798
59
            return Math.min(2, topLevelSurfaceList.count-1);
3799
60
        }
3800
61
        return Math.min(index+1, topLevelSurfaceList.count-1);
3801
62
    }
3802
63
3803
64
3804
65
    property int itemX: {
3805
66
        if (mainStageDelegate == thisDelegate) {
3806
67
            return thisDelegate.isDash ? 0 : leftEdgeDragProgress;
3807
68
        }
3808
69
        if (sideStageDelegate == thisDelegate) {
3809
70
            return sideStageX;
3810
71
        }
3811
72
        return thisDelegate.isDash && leftEdgeDragProgress > 0 ? 0 : sceneWidth;
3812
73
    }
3813
74
    Behavior on itemX { enabled: root.animateX; UbuntuNumberAnimation {} }
3814
75
3815
76
    readonly property int itemWidth: stage == ApplicationInfoInterface.MainStage ?
3816
77
                                     sideStageDelegate != null ? sideStageX : sceneWidth :
3817
78
                                     stage == ApplicationInfoInterface.SideStage ? sideStageWidth : sceneWidth
3818
79
}
3819
0
80
3820
=== modified file 'qml/Stage/SurfaceContainer.qml'
3821
--- qml/Stages/SurfaceContainer.qml	2016-05-18 21:58:39 +0000
3822
+++ qml/Stage/SurfaceContainer.qml	2016-10-11 21:49:13 +0000
3823
@@ -23,6 +23,8 @@
3824
23
FocusScope {
23
FocusScope {
3825
24
    id: root
24
    id: root
3826
25
    objectName: "surfaceContainer"
25
    objectName: "surfaceContainer"
3827
26
    implicitWidth: surfaceItem.implicitWidth
3828
27
    implicitHeight: surfaceItem.implicitHeight
3829
26
28
3830
27
    // Must be set from outside
29
    // Must be set from outside
3831
28
    property var surface: null
30
    property var surface: null
3832
@@ -32,7 +34,6 @@
3833
32
    property int requestedHeight: -1
34
    property int requestedHeight: -1
3834
33
    property bool interactive
35
    property bool interactive
3835
34
    property int surfaceOrientationAngle: 0
36
    property int surfaceOrientationAngle: 0
3836
35
    property bool resizeSurface: true
3837
36
    property bool isPromptSurface: false
37
    property bool isPromptSurface: false
3838
37
    // FIME - dont export, use interactive property. Need to fix qtmir to handle consumesInputChanged
38
    // FIME - dont export, use interactive property. Need to fix qtmir to handle consumesInputChanged
3839
38
    // to update surface activeFocus. See mock MirSurfaceItem.
39
    // to update surface activeFocus. See mock MirSurfaceItem.
3840
@@ -58,35 +59,15 @@
3841
58
    MirSurfaceItem {
59
    MirSurfaceItem {
3842
59
        id: surfaceItem
60
        id: surfaceItem
3843
60
        objectName: "surfaceItem"
61
        objectName: "surfaceItem"
3844
62
        anchors.fill: parent
3845
61
63
3846
62
        focus: true
64
        focus: true
3847
63
65
3848
64
        fillMode: MirSurfaceItem.PadOrCrop
66
        fillMode: MirSurfaceItem.PadOrCrop
3849
65
        consumesInput: true
67
        consumesInput: true
3850
66
68
3874
67
        surfaceWidth: {
69
        surfaceWidth: root.requestedWidth
3875
68
            if (root.resizeSurface) {
70
        surfaceHeight: root.requestedHeight
3853
69
                if (root.requestedWidth >= 0) {
3854
70
                    return root.requestedWidth;
3855
71
                } else {
3856
72
                    return width;
3857
73
                }
3858
74
            } else {
3859
75
                return -1;
3860
76
            }
3861
77
        }
3862
78
3863
79
        surfaceHeight: {
3864
80
            if (root.resizeSurface) {
3865
81
                if (root.requestedHeight >= 0) {
3866
82
                    return root.requestedHeight;
3867
83
                } else {
3868
84
                    return height;
3869
85
                }
3870
86
            } else {
3871
87
                return -1;
3872
88
            }
3873
89
        }
3876
90
71
3877
91
        enabled: root.interactive
72
        enabled: root.interactive
3878
92
        antialiasing: !root.interactive
73
        antialiasing: !root.interactive
3879
@@ -99,34 +80,6 @@
3880
99
        enabled: surfaceItem.enabled
80
        enabled: surfaceItem.enabled
3881
100
    }
81
    }
3882
101
82
3883
102
    // MirSurface size drives SurfaceContainer size
3884
103
    Binding {
3885
104
        target: surfaceItem; property: "width"; value: root.surface ? root.surface.size.width : 0
3886
105
        when: root.requestedWidth >= 0 && root.surface
3887
106
    }
3888
107
    Binding {
3889
108
        target: surfaceItem; property: "height"; value: root.surface ? root.surface.size.height : 0
3890
109
        when: root.requestedHeight >= 0 && root.surface
3891
110
    }
3892
111
    Binding {
3893
112
        target: root; property: "width"; value: surfaceItem.width
3894
113
        when: root.requestedWidth >= 0
3895
114
    }
3896
115
    Binding {
3897
116
        target: root; property: "height"; value: surfaceItem.height
3898
117
        when: root.requestedHeight >= 0
3899
118
    }
3900
119
3901
120
    // SurfaceContainer size drives MirSurface size
3902
121
    Binding {
3903
122
        target: surfaceItem; property: "width"; value: root.width
3904
123
        when: root.requestedWidth < 0
3905
124
    }
3906
125
    Binding {
3907
126
        target: surfaceItem; property: "height"; value: root.height
3908
127
        when: root.requestedHeight < 0
3909
128
    }
3910
129
3911
130
    Loader {
83
    Loader {
3912
131
        id: animationsLoader
84
        id: animationsLoader
3913
132
        objectName: "animationsLoader"
85
        objectName: "animationsLoader"
3914
133
86
3915
=== modified file 'qml/Stage/TopLevelSurfaceRepeater.qml'
3916
--- qml/Stages/TopLevelSurfaceRepeater.qml	2016-09-07 09:48:56 +0000
3917
+++ qml/Stage/TopLevelSurfaceRepeater.qml	2016-10-11 21:49:13 +0000
3918
@@ -55,4 +55,13 @@
3919
55
            startingUp = false;
55
            startingUp = false;
3920
56
        }
56
        }
3921
57
    }
57
    }
3922
58
3923
59
    function indexOf(delegateItem) {
3924
60
        for (var i = 0; i < count; i++) {
3925
61
            if (itemAt(i) === delegateItem) {
3926
62
                return i;
3927
63
            }
3928
64
        }
3929
65
        return -1;
3930
66
    }
3931
58
}
67
}
3932
59
68
3933
=== modified file 'qml/Stage/WindowDecoration.qml'
3934
--- qml/Stages/WindowDecoration.qml	2016-09-22 07:42:18 +0000
3935
+++ qml/Stage/WindowDecoration.qml	2016-10-11 21:49:13 +0000
3936
@@ -79,7 +79,7 @@
3937
79
            onMaximizeClicked: root.maximizeClicked();
79
            onMaximizeClicked: root.maximizeClicked();
3938
80
            onMaximizeHorizontallyClicked: if (root.target.canBeMaximizedHorizontally) root.maximizeHorizontallyClicked();
80
            onMaximizeHorizontallyClicked: if (root.target.canBeMaximizedHorizontally) root.maximizeHorizontallyClicked();
3939
81
            onMaximizeVerticallyClicked: if (root.target.canBeMaximizedVertically) root.maximizeVerticallyClicked();
81
            onMaximizeVerticallyClicked: if (root.target.canBeMaximizedVertically) root.maximizeVerticallyClicked();
3941
82
            closeButtonShown: root.target.application.appId !== "unity8-dash"
82
            closeButtonShown: root.target.appId !== "unity8-dash"
3942
83
        }
83
        }
3943
84
84
3944
85
        Label {
85
        Label {
3945
86
86
3946
=== added file 'qml/Stage/WindowInfoItem.qml'
3947
--- qml/Stage/WindowInfoItem.qml	1970-01-01 00:00:00 +0000
3948
+++ qml/Stage/WindowInfoItem.qml	2016-10-11 21:49:13 +0000
3949
@@ -0,0 +1,53 @@
3950
1
import QtQuick 2.4
3951
2
import Ubuntu.Components 1.3
3952
3
3953
4
Item {
3954
5
    id: root
3955
6
    implicitWidth: Math.max(iconShape.width, titleLabel.width)
3956
7
    implicitHeight: iconShape.height + titleLabel.height + labelMargin + iconMargin
3957
8
    property alias title: titleLabel.text
3958
9
    property alias iconSource: icon.source
3959
10
3960
11
    property real iconHeight: (height - titleLabel.height) * 0.65
3961
12
    property real iconMargin: (height - titleLabel.height) * 0.25
3962
13
    property real labelMargin: (height - titleLabel.height) * 0.1
3963
14
    property int maxWidth: units.gu(10)
3964
15
3965
16
    signal clicked()
3966
17
3967
18
    ProportionalShape {
3968
19
        id: iconShape
3969
20
        anchors {
3970
21
            top: parent.top
3971
22
            topMargin: iconMargin
3972
23
            left: parent.left
3973
24
        }
3974
25
        height: iconHeight
3975
26
        borderSource: "undefined"
3976
27
        aspect: UbuntuShape.Flat
3977
28
        source: Image {
3978
29
            id: icon
3979
30
            sourceSize.width: iconShape.width
3980
31
            sourceSize.height: iconShape.height
3981
32
            cache: false // see lpbug#1543290 why no cache
3982
33
        }
3983
34
    }
3984
35
3985
36
    MouseArea {
3986
37
        anchors.fill: iconShape
3987
38
        onClicked: root.clicked()
3988
39
    }
3989
40
3990
41
    Label {
3991
42
        id: titleLabel
3992
43
        anchors {
3993
44
            left: iconShape.left
3994
45
            top: iconShape.bottom
3995
46
            topMargin: labelMargin
3996
47
        }
3997
48
        width: root.maxWidth
3998
49
        fontSize: 'small'
3999
50
        color: 'white'
4000
51
        elide: Label.ElideRight
4001
52
    }
4002
53
}
4003
0
54
4004
=== modified file 'qml/Stage/WindowResizeArea.qml'
4005
--- qml/Stages/WindowResizeArea.qml	2016-08-31 13:00:26 +0000
4006
+++ qml/Stage/WindowResizeArea.qml	2016-10-11 21:49:13 +0000
4007
@@ -75,14 +75,15 @@
4008
75
75
4009
76
    function loadWindowState() {
76
    function loadWindowState() {
4010
77
        var windowGeometry = windowStateStorage.getGeometry(root.windowId,
77
        var windowGeometry = windowStateStorage.getGeometry(root.windowId,
4015
78
                                                            Qt.rect(target.requestedX, target.requestedY, defaultWidth, defaultHeight));
78
                                                            Qt.rect(target.windowedX, target.windowedY, defaultWidth, defaultHeight));
4016
79
79
4017
80
        target.requestedWidth = Qt.binding(function() { return Math.min(Math.max(windowGeometry.width, d.minimumWidth), screenWidth - root.leftMargin); });
80
4018
81
        target.requestedHeight = Qt.binding(function() { return Math.min(Math.max(windowGeometry.height, d.minimumHeight),
81
        target.windowedWidth = Qt.binding(function() { return Math.min(Math.max(windowGeometry.width, d.minimumWidth), screenWidth - root.leftMargin); });
4019
82
        target.windowedHeight = Qt.binding(function() { return Math.min(Math.max(windowGeometry.height, d.minimumHeight),
4020
82
                                                                         root.screenHeight - (target.fullscreen ? 0 : PanelState.panelHeight)); });
83
                                                                         root.screenHeight - (target.fullscreen ? 0 : PanelState.panelHeight)); });
4022
83
        target.requestedX = Qt.binding(function() { return Math.max(Math.min(windowGeometry.x, root.screenWidth - root.leftMargin - target.requestedWidth),
84
        target.windowedX = Qt.binding(function() { return Math.max(Math.min(windowGeometry.x, root.screenWidth - root.leftMargin - target.windowedWidth),
4023
84
                                                           (target.fullscreen ? 0 : root.leftMargin)); });
85
                                                           (target.fullscreen ? 0 : root.leftMargin)); });
4025
85
        target.requestedY = Qt.binding(function() { return Math.max(Math.min(windowGeometry.y, root.screenHeight - target.requestedHeight), PanelState.panelHeight); });
86
        target.windowedY = Qt.binding(function() { return Math.max(Math.min(windowGeometry.y, root.screenHeight - target.windowedHeight), PanelState.panelHeight); });
4026
86
87
4027
87
        var windowState = windowStateStorage.getState(root.windowId, WindowStateStorage.WindowStateNormal)
88
        var windowState = windowStateStorage.getState(root.windowId, WindowStateStorage.WindowStateNormal)
4028
88
        target.restore(false /* animated */, windowState);
89
        target.restore(false /* animated */, windowState);
4029
@@ -111,28 +112,28 @@
4030
111
112
4031
112
        readonly property int minimumWidth: root.target ? Math.max(root.minWidth, root.target.minimumWidth) : root.minWidth
113
        readonly property int minimumWidth: root.target ? Math.max(root.minWidth, root.target.minimumWidth) : root.minWidth
4032
113
        onMinimumWidthChanged: {
114
        onMinimumWidthChanged: {
4035
114
            if (target.requestedWidth < minimumWidth) {
115
            if (target.windowedWidth < minimumWidth) {
4036
115
                target.requestedWidth = minimumWidth;
116
                target.windowedWidth = minimumWidth;
4037
116
            }
117
            }
4038
117
        }
118
        }
4039
118
        readonly property int minimumHeight: root.target ? Math.max(root.minHeight, root.target.minimumHeight) : root.minHeight
119
        readonly property int minimumHeight: root.target ? Math.max(root.minHeight, root.target.minimumHeight) : root.minHeight
4040
119
        onMinimumHeightChanged: {
120
        onMinimumHeightChanged: {
4043
120
            if (target.requestedHeight < minimumHeight) {
121
            if (target.windowedHeight < minimumHeight) {
4044
121
                target.requestedHeight = minimumHeight;
122
                target.windowedHeight = minimumHeight;
4045
122
            }
123
            }
4046
123
        }
124
        }
4047
124
        readonly property int maximumWidth: root.target && root.target.maximumWidth >= minimumWidth && root.target.maximumWidth > 0
125
        readonly property int maximumWidth: root.target && root.target.maximumWidth >= minimumWidth && root.target.maximumWidth > 0
4048
125
            ? root.target.maximumWidth : maxSafeInt
126
            ? root.target.maximumWidth : maxSafeInt
4049
126
        onMaximumWidthChanged: {
127
        onMaximumWidthChanged: {
4052
127
            if (target.requestedWidth > maximumWidth) {
128
            if (target.windowedWidth > maximumWidth) {
4053
128
                target.requestedWidth = maximumWidth;
129
                target.windowedWidth = maximumWidth;
4054
129
            }
130
            }
4055
130
        }
131
        }
4056
131
        readonly property int maximumHeight: root.target && root.target.maximumHeight >= minimumHeight && root.target.maximumHeight > 0
132
        readonly property int maximumHeight: root.target && root.target.maximumHeight >= minimumHeight && root.target.maximumHeight > 0
4057
132
            ? root.target.maximumHeight : maxSafeInt
133
            ? root.target.maximumHeight : maxSafeInt
4058
133
        onMaximumHeightChanged: {
134
        onMaximumHeightChanged: {
4061
134
            if (target.requestedHeight > maximumHeight) {
135
            if (target.windowedHeight > maximumHeight) {
4062
135
                target.requestedHeight = maximumHeight;
136
                target.windowedHeight = maximumHeight;
4063
136
            }
137
            }
4064
137
        }
138
        }
4065
138
        readonly property int widthIncrement: {
139
        readonly property int widthIncrement: {
4066
@@ -247,8 +248,8 @@
4067
247
            var pos = mapToItem(root.target.parent, mouseX, mouseY);
248
            var pos = mapToItem(root.target.parent, mouseX, mouseY);
4068
248
            d.startMousePosX = pos.x;
249
            d.startMousePosX = pos.x;
4069
249
            d.startMousePosY = pos.y;
250
            d.startMousePosY = pos.y;
4072
250
            d.startX = target.requestedX;
251
            d.startX = target.windowedX;
4073
251
            d.startY = target.requestedY;
252
            d.startY = target.windowedY;
4074
252
            d.startWidth = target.width;
253
            d.startWidth = target.width;
4075
253
            d.startHeight = target.height;
254
            d.startHeight = target.height;
4076
254
            d.currentWidth = target.width;
255
            d.currentWidth = target.width;
4077
@@ -285,53 +286,53 @@
4078
285
286
4079
286
        if (d.leftBorder) {
287
        if (d.leftBorder) {
4080
287
            var newTargetX = d.startX + deltaX;
288
            var newTargetX = d.startX + deltaX;
4082
288
            var rightBorderX = target.requestedX + target.width;
289
            var rightBorderX = target.windowedX + target.width;
4083
289
            if (rightBorderX > newTargetX + d.minimumWidth) {
290
            if (rightBorderX > newTargetX + d.minimumWidth) {
4084
290
                if (rightBorderX  < newTargetX + d.maximumWidth) {
291
                if (rightBorderX  < newTargetX + d.maximumWidth) {
4086
291
                    target.requestedWidth = rightBorderX - newTargetX;
292
                    target.windowedWidth = rightBorderX - newTargetX;
4087
292
                } else {
293
                } else {
4089
293
                    target.requestedWidth = d.maximumWidth;
294
                    target.windowedWidth = d.maximumWidth;
4090
294
                }
295
                }
4091
295
            } else {
296
            } else {
4093
296
                target.requestedWidth = d.minimumWidth;
297
                target.windowedWidth = d.minimumWidth;
4094
297
            }
298
            }
4095
298
299
4096
299
        } else if (d.rightBorder) {
300
        } else if (d.rightBorder) {
4097
300
            var newWidth = d.startWidth + deltaX;
301
            var newWidth = d.startWidth + deltaX;
4098
301
            if (newWidth > d.minimumWidth) {
302
            if (newWidth > d.minimumWidth) {
4099
302
                if (newWidth < d.maximumWidth) {
303
                if (newWidth < d.maximumWidth) {
4101
303
                    target.requestedWidth = newWidth;
304
                    target.windowedWidth = newWidth;
4102
304
                } else {
305
                } else {
4104
305
                    target.requestedWidth = d.maximumWidth;
306
                    target.windowedWidth = d.maximumWidth;
4105
306
                }
307
                }
4106
307
            } else {
308
            } else {
4108
308
                target.requestedWidth = d.minimumWidth;
309
                target.windowedWidth = d.minimumWidth;
4109
309
            }
310
            }
4110
310
        }
311
        }
4111
311
312
4112
312
        if (d.topBorder) {
313
        if (d.topBorder) {
4113
313
            var newTargetY = Math.max(d.startY + deltaY, PanelState.panelHeight); // disallow resizing up past Panel
314
            var newTargetY = Math.max(d.startY + deltaY, PanelState.panelHeight); // disallow resizing up past Panel
4115
314
            var bottomBorderY = target.requestedY + target.height;
315
            var bottomBorderY = target.windowedY + target.height;
4116
315
            if (bottomBorderY > newTargetY + d.minimumHeight) {
316
            if (bottomBorderY > newTargetY + d.minimumHeight) {
4117
316
                if (bottomBorderY < newTargetY + d.maximumHeight) {
317
                if (bottomBorderY < newTargetY + d.maximumHeight) {
4119
317
                    target.requestedHeight = bottomBorderY - newTargetY;
318
                    target.windowedHeight = bottomBorderY - newTargetY;
4120
318
                } else {
319
                } else {
4122
319
                    target.requestedHeight = d.maximumHeight;
320
                    target.windowedHeight = d.maximumHeight;
4123
320
                }
321
                }
4124
321
            } else {
322
            } else {
4126
322
                target.requestedHeight = d.minimumHeight;
323
                target.windowedHeight = d.minimumHeight;
4127
323
            }
324
            }
4128
324
325
4129
325
        } else if (d.bottomBorder) {
326
        } else if (d.bottomBorder) {
4130
326
            var newHeight = d.startHeight + deltaY;
327
            var newHeight = d.startHeight + deltaY;
4131
327
            if (newHeight > d.minimumHeight) {
328
            if (newHeight > d.minimumHeight) {
4132
328
                if (newHeight < d.maximumHeight) {
329
                if (newHeight < d.maximumHeight) {
4134
329
                    target.requestedHeight = newHeight;
330
                    target.windowedHeight = newHeight;
4135
330
                } else {
331
                } else {
4137
331
                    target.requestedHeight = d.maximumHeight;
332
                    target.windowedHeight = d.maximumHeight;
4138
332
                }
333
                }
4139
333
            } else {
334
            } else {
4141
334
                target.requestedHeight = d.minimumHeight;
335
                target.windowedHeight = d.minimumHeight;
4142
335
            }
336
            }
4143
336
        }
337
        }
4144
337
    }
338
    }
4145
@@ -340,13 +341,13 @@
4146
340
        target: root.target
341
        target: root.target
4147
341
        onWidthChanged: {
342
        onWidthChanged: {
4148
342
            if (d.moveLeftBorder) {
343
            if (d.moveLeftBorder) {
4150
343
                target.requestedX += d.currentWidth - target.width;
344
                target.windowedX += d.currentWidth - target.width;
4151
344
            }
345
            }
4152
345
            d.currentWidth = target.width;
346
            d.currentWidth = target.width;
4153
346
        }
347
        }
4154
347
        onHeightChanged: {
348
        onHeightChanged: {
4155
348
            if (d.moveTopBorder) {
349
            if (d.moveTopBorder) {
4157
349
                target.requestedY += d.currentHeight - target.height;
350
                target.windowedY += d.currentHeight - target.height;
4158
350
            }
351
            }
4159
351
            d.currentHeight = target.height;
352
            d.currentHeight = target.height;
4160
352
        }
353
        }
4161
353
354
4162
=== removed file 'qml/Stages/AbstractStage.qml'
4163
--- qml/Stages/AbstractStage.qml	2016-09-07 08:36:59 +0000
4164
+++ qml/Stages/AbstractStage.qml	1970-01-01 00:00:00 +0000
4165
@@ -1,93 +0,0 @@
4166
1
/*
4167
2
 * Copyright (C) 2015-2016 Canonical, Ltd.
4168
3
 *
4169
4
 * This program is free software; you can redistribute it and/or modify
4170
5
 * it under the terms of the GNU General Public License as published by
4171
6
 * the Free Software Foundation; version 3.
4172
7
 *
4173
8
 * This program is distributed in the hope that it will be useful,
4174
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4175
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4176
11
 * GNU General Public License for more details.
4177
12
 *
4178
13
 * You should have received a copy of the GNU General Public License
4179
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4180
15
 */
4181
16
4182
17
import QtQuick 2.4
4183
18
import Ubuntu.Components 1.3
4184
19
import GlobalShortcut 1.0
4185
20
import GSettings 1.0
4186
21
4187
22
FocusScope {
4188
23
    id: root
4189
24
4190
25
    // Controls to be set from outside
4191
26
    property QtObject applicationManager
4192
27
    property QtObject topLevelSurfaceList
4193
28
    property bool altTabPressed
4194
29
    property url background
4195
30
    property bool beingResized
4196
31
    property int dragAreaWidth
4197
32
    property real dragProgress // How far left the stage has been dragged, used externally by tutorial code
4198
33
    property bool interactive
4199
34
    property real inverseProgress // This is the progress for left edge drags, in pixels.
4200
35
    property bool keepDashRunning: true
4201
36
    property real maximizedAppTopMargin
4202
37
    property real nativeHeight
4203
38
    property real nativeWidth
4204
39
    property QtObject orientations
4205
40
    property int shellOrientation
4206
41
    property int shellOrientationAngle
4207
42
    property bool spreadEnabled: true // If false, animations and right edge will be disabled
4208
43
    property bool suspended
4209
44
     // A Stage should paint a wallpaper etc over its full size but not use the margins for window placement
4210
45
    property int leftMargin: 0
4211
46
    property alias paintBackground: background.visible
4212
47
    property bool oskEnabled: false
4213
48
4214
49
    // To be read from outside
4215
50
    property var mainApp: null
4216
51
    property int mainAppWindowOrientationAngle: 0
4217
52
    property bool orientationChangesEnabled
4218
53
    property int supportedOrientations: Qt.PortraitOrientation
4219
54
                                      | Qt.LandscapeOrientation
4220
55
                                      | Qt.InvertedPortraitOrientation
4221
56
                                      | Qt.InvertedLandscapeOrientation
4222
57
4223
58
    property Item itemConfiningMouseCursor: null
4224
59
4225
60
4226
61
    signal stageAboutToBeUnloaded
4227
62
    signal itemSnapshotRequested(Item item)
4228
63
4229
64
    // Shared code for use in stage implementations
4230
65
    GSettings {
4231
66
        id: lifecycleExceptions
4232
67
        schema.id: "com.canonical.qtmir"
4233
68
    }
4234
69
4235
70
    function isExemptFromLifecycle(appId) {
4236
71
        var shortAppId = appId.split('_')[0];
4237
72
        for (var i = 0; i < lifecycleExceptions.lifecycleExemptAppids.length; i++) {
4238
73
            if (shortAppId === lifecycleExceptions.lifecycleExemptAppids[i]) {
4239
74
                return true;
4240
75
            }
4241
76
        }
4242
77
        return false;
4243
78
    }
4244
79
4245
80
    Rectangle {
4246
81
        id: background
4247
82
        color: "#060606"
4248
83
        anchors.fill: parent
4249
84
    }
4250
85
4251
86
    // shared Alt+F4 functionality
4252
87
    function closeFocusedDelegate() {} // to be implemented by stages
4253
88
4254
89
    GlobalShortcut {
4255
90
        shortcut: Qt.AltModifier|Qt.Key_F4
4256
91
        onTriggered: closeFocusedDelegate()
4257
92
    }
4258
93
}
4259
94
0
4260
=== removed file 'qml/Stages/DesktopSpread.qml'
4261
--- qml/Stages/DesktopSpread.qml	2016-06-15 14:08:18 +0000
4262
+++ qml/Stages/DesktopSpread.qml	1970-01-01 00:00:00 +0000
4263
@@ -1,576 +0,0 @@
4264
1
/*
4265
2
 * Copyright (C) 2015-2016 Canonical, Ltd.
4266
3
 *
4267
4
 * This program is free software; you can redistribute it and/or modify
4268
5
 * it under the terms of the GNU General Public License as published by
4269
6
 * the Free Software Foundation; version 3.
4270
7
 *
4271
8
 * This program is distributed in the hope that it will be useful,
4272
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4273
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4274
11
 * GNU General Public License for more details.
4275
12
 *
4276
13
 * You should have received a copy of the GNU General Public License
4277
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4278
15
 */
4279
16
4280
17
import QtQuick 2.4
4281
18
import QtQuick.Layouts 1.1
4282
19
import Ubuntu.Components 1.3
4283
20
import Ubuntu.Gestures 0.1
4284
21
import Unity.Application 0.1
4285
22
import "../Components"
4286
23
import Utils 0.1
4287
24
4288
25
FocusScope {
4289
26
    id: root
4290
27
4291
28
    property bool altTabPressed: false
4292
29
    property Item workspace: null
4293
30
4294
31
    readonly property alias ready: blurLayer.ready
4295
32
    readonly property alias highlightedIndex: spreadRepeater.highlightedIndex
4296
33
4297
34
    signal playFocusAnimation(int index)
4298
35
4299
36
    function show() {
4300
37
        spreadContainer.animateIn = true;
4301
38
        root.state = "altTab";
4302
39
    }
4303
40
4304
41
    onFocusChanged: {
4305
42
        // When the spread comes active, we want to keep focus to the input handler below
4306
43
        // Make sure nothing inside the ApplicationWindow grabs our focus!
4307
44
        if (focus) {
4308
45
            forceActiveFocus();
4309
46
        }
4310
47
    }
4311
48
4312
49
    Keys.onPressed: {
4313
50
        switch (event.key) {
4314
51
        case Qt.Key_Left:
4315
52
        case Qt.Key_Backtab:
4316
53
            selectPrevious(event.isAutoRepeat)
4317
54
            event.accepted = true;
4318
55
            break;
4319
56
        case Qt.Key_Right:
4320
57
        case Qt.Key_Tab:
4321
58
            selectNext(event.isAutoRepeat)
4322
59
            event.accepted = true;
4323
60
            break;
4324
61
        case Qt.Key_Escape:
4325
62
            spreadRepeater.highlightedIndex = -1
4326
63
            // Falling through intentionally
4327
64
        case Qt.Key_Enter:
4328
65
        case Qt.Key_Return:
4329
66
        case Qt.Key_Space:
4330
67
            root.state = ""
4331
68
            event.accepted = true;
4332
69
        }
4333
70
    }
4334
71
4335
72
    function selectNext(isAutoRepeat) {
4336
73
        if (isAutoRepeat && spreadRepeater.highlightedIndex >= topLevelSurfaceList.count -1) {
4337
74
            return; // AutoRepeat is not allowed to wrap around
4338
75
        }
4339
76
4340
77
        spreadRepeater.highlightedIndex = (spreadRepeater.highlightedIndex + 1) % topLevelSurfaceList.count;
4341
78
        var newContentX = ((spreadFlickable.contentWidth) / (topLevelSurfaceList.count + 1)) * Math.max(0, Math.min(topLevelSurfaceList.count - 5, spreadRepeater.highlightedIndex - 3));
4342
79
        if (spreadFlickable.contentX < newContentX || spreadRepeater.highlightedIndex == 0) {
4343
80
            spreadFlickable.snapTo(newContentX)
4344
81
        }
4345
82
    }
4346
83
4347
84
    function selectPrevious(isAutoRepeat) {
4348
85
        if (isAutoRepeat && spreadRepeater.highlightedIndex == 0) {
4349
86
            return; // AutoRepeat is not allowed to wrap around
4350
87
        }
4351
88
4352
89
        var newIndex = spreadRepeater.highlightedIndex - 1 >= 0 ? spreadRepeater.highlightedIndex - 1 : topLevelSurfaceList.count - 1;
4353
90
        spreadRepeater.highlightedIndex = newIndex;
4354
91
        var newContentX = ((spreadFlickable.contentWidth) / (topLevelSurfaceList.count + 1)) * Math.max(0, Math.min(topLevelSurfaceList.count - 5, spreadRepeater.highlightedIndex - 1));
4355
92
        if (spreadFlickable.contentX > newContentX || newIndex == topLevelSurfaceList.count -1) {
4356
93
            spreadFlickable.snapTo(newContentX)
4357
94
        }
4358
95
    }
4359
96
4360
97
    function focusSelected() {
4361
98
        if (spreadRepeater.highlightedIndex != -1) {
4362
99
            if (spreadContainer.visible) {
4363
100
                root.playFocusAnimation(spreadRepeater.highlightedIndex)
4364
101
            }
4365
102
            var surface = topLevelSurfaceList.surfaceAt(spreadRepeater.highlightedIndex);
4366
103
            surface.requestFocus();
4367
104
        }
4368
105
    }
4369
106
4370
107
    function cancel() {
4371
108
        spreadRepeater.highlightedIndex = -1;
4372
109
        state = ""
4373
110
    }
4374
111
4375
112
    BlurLayer {
4376
113
        id: blurLayer
4377
114
        anchors.fill: parent
4378
115
        source: root.workspace
4379
116
        visible: false
4380
117
    }
4381
118
4382
119
    Rectangle {
4383
120
        id: spreadBackground
4384
121
        anchors.fill: parent
4385
122
        color: "#B2000000"
4386
123
        visible: false
4387
124
        opacity: visible ? 1 : 0
4388
125
        Behavior on opacity {
4389
126
            UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
4390
127
        }
4391
128
    }
4392
129
4393
130
    MouseArea {
4394
131
        id: eventEater
4395
132
        anchors.fill: parent
4396
133
        visible: spreadBackground.visible
4397
134
        enabled: visible
4398
135
        acceptedButtons: Qt.AllButtons
4399
136
        onWheel: wheel.accepted = true;
4400
137
    }
4401
138
4402
139
    Item {
4403
140
        id: spreadContainer
4404
141
        objectName: "spreadContainer"
4405
142
        anchors.fill: parent
4406
143
        visible: false
4407
144
4408
145
        property bool animateIn: false
4409
146
4410
147
        Repeater {
4411
148
            id: spreadRepeater
4412
149
            objectName: "spreadRepeater"
4413
150
            model: topLevelSurfaceList
4414
151
4415
152
            property int highlightedIndex: -1
4416
153
            property int closingIndex: -1
4417
154
4418
155
            function indexOf(delegateItem) {
4419
156
                for (var i = 0; i < spreadRepeater.count; i++) {
4420
157
                    if (spreadRepeater.itemAt(i) === delegateItem) {
4421
158
                        return i;
4422
159
                    }
4423
160
                }
4424
161
                return -1;
4425
162
            }
4426
163
4427
164
            delegate: Item {
4428
165
                id: spreadDelegate
4429
166
                objectName: "spreadDelegate"
4430
167
                width: units.gu(20)
4431
168
                height: units.gu(20)
4432
169
4433
170
                property real angle: 0
4434
171
                property real itemScale: 1
4435
172
                property int itemScaleOriginX: 0
4436
173
                property int itemScaleOriginY: 0
4437
174
4438
175
                readonly property string windowTitle: clippedSpreadDelegate.window.title
4439
176
4440
177
                Behavior on x {
4441
178
                    id: closeBehavior
4442
179
                    enabled: spreadRepeater.closingIndex >= 0
4443
180
                    UbuntuNumberAnimation {
4444
181
                        onRunningChanged: if (!running) spreadRepeater.closingIndex = -1
4445
182
                    }
4446
183
                }
4447
184
4448
185
                DesktopSpreadDelegate {
4449
186
                    id: clippedSpreadDelegate
4450
187
                    objectName: "clippedSpreadDelegate"
4451
188
                    anchors.left: parent.left
4452
189
                    anchors.top: parent.top
4453
190
                    application: model.application
4454
191
                    surface: model.surface
4455
192
                    width: spreadMaths.spreadHeight
4456
193
                    height: spreadMaths.spreadHeight
4457
194
4458
195
                    transform: [
4459
196
                        Scale {
4460
197
                            origin.x: itemScaleOriginX
4461
198
                            origin.y: itemScaleOriginY
4462
199
                            xScale: itemScale
4463
200
                            yScale: itemScale
4464
201
                        },
4465
202
                        Rotation {
4466
203
                            origin { x: 0; y: (clippedSpreadDelegate.height - (clippedSpreadDelegate.height * itemScale / 2)) }
4467
204
                            axis { x: 0; y: 1; z: 0 }
4468
205
                            angle: spreadDelegate.angle
4469
206
                        }
4470
207
                    ]
4471
208
4472
209
                    MouseArea {
4473
210
                        id: spreadSelectArea
4474
211
                        anchors.fill: parent
4475
212
                        anchors.margins: -units.gu(2)
4476
213
                        enabled: false
4477
214
                        onClicked: {
4478
215
                            spreadRepeater.highlightedIndex = index;
4479
216
                            root.state = "";
4480
217
                        }
4481
218
                    }
4482
219
                }
4483
220
4484
221
                SpreadMaths {
4485
222
                    id: spreadMaths
4486
223
                    flickable: spreadFlickable
4487
224
                    itemIndex: index
4488
225
                    totalItems: Math.max(6, topLevelSurfaceList.count)
4489
226
                    sceneHeight: root.height
4490
227
                    itemHeight: spreadDelegate.height
4491
228
                }
4492
229
4493
230
                states: [
4494
231
                    State {
4495
232
                        name: "altTab"; when: root.state == "altTab" && spreadContainer.visible
4496
233
                        PropertyChanges {
4497
234
                            target: spreadDelegate
4498
235
                            x: spreadMaths.animatedX
4499
236
                            y: spreadMaths.animatedY + (spreadDelegate.height - clippedSpreadDelegate.height) - units.gu(2)
4500
237
                            width: spreadMaths.spreadHeight
4501
238
                            height: spreadMaths.sceneHeight
4502
239
                            angle: spreadMaths.animatedAngle
4503
240
                            itemScale: spreadMaths.scale
4504
241
                            itemScaleOriginY: clippedSpreadDelegate.height / 2;
4505
242
                            z: index
4506
243
                            visible: spreadMaths.itemVisible
4507
244
                        }
4508
245
                        PropertyChanges {
4509
246
                            target: clippedSpreadDelegate
4510
247
                            highlightShown: index == spreadRepeater.highlightedIndex
4511
248
                            state: "transformed"
4512
249
                            shadowOpacity: spreadMaths.shadowOpacity
4513
250
                            anchors.topMargin: units.gu(2)
4514
251
                        }
4515
252
                        PropertyChanges {
4516
253
                            target: tileInfo
4517
254
                            visible: true
4518
255
                            opacity: spreadMaths.tileInfoOpacity
4519
256
                        }
4520
257
                        PropertyChanges {
4521
258
                            target: spreadSelectArea
4522
259
                            enabled: true
4523
260
                        }
4524
261
                    }
4525
262
                ]
4526
263
                transitions: [
4527
264
                    Transition {
4528
265
                        from: ""
4529
266
                        to: "altTab"
4530
267
                        SequentialAnimation {
4531
268
                            ParallelAnimation {
4532
269
                                PropertyAction { target: spreadDelegate; properties: "y,height,width,angle,z,itemScale,itemScaleOriginY,visible" }
4533
270
                                PropertyAction { target: clippedSpreadDelegate; properties: "anchors.topMargin" }
4534
271
                                PropertyAnimation {
4535
272
                                    target: spreadDelegate; properties: "x"
4536
273
                                    from: root.width
4537
274
                                    duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration :0
4538
275
                                    easing: UbuntuAnimation.StandardEasing
4539
276
                                }
4540
277
                                UbuntuNumberAnimation { target: clippedSpreadDelegate; property: "shadowOpacity"; from: 0; to: spreadMaths.shadowOpacity; duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration : 0 }
4541
278
                                UbuntuNumberAnimation { target: tileInfo; property: "opacity"; from: 0; to: spreadMaths.tileInfoOpacity; duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration : 0 }
4542
279
                            }
4543
280
                            PropertyAction { target: spreadSelectArea; property: "enabled" }
4544
281
                        }
4545
282
                    }
4546
283
                ]
4547
284
4548
285
                MouseArea {
4549
286
                    id: tileInfo
4550
287
                    objectName: "tileInfo"
4551
288
                    anchors {
4552
289
                        left: parent.left
4553
290
                        top: clippedSpreadDelegate.bottom
4554
291
                        topMargin: ((spreadMaths.sceneHeight - spreadDelegate.y) - clippedSpreadDelegate.height) * 0.2
4555
292
                    }
4556
293
                    property int nextItemX: spreadRepeater.count > index + 1 ? spreadRepeater.itemAt(index + 1).x : spreadDelegate.x + units.gu(30)
4557
294
                    width: Math.min(units.gu(30), nextItemX - spreadDelegate.x)
4558
295
                    height: titleInfoColumn.height
4559
296
                    visible: false
4560
297
                    hoverEnabled: true
4561
298
4562
299
                    onContainsMouseChanged: {
4563
300
                        if (containsMouse) {
4564
301
                            spreadRepeater.highlightedIndex = index
4565
302
                        }
4566
303
                    }
4567
304
4568
305
                    onClicked: {
4569
306
                        root.state = ""
4570
307
                    }
4571
308
4572
309
                    ColumnLayout {
4573
310
                        id: titleInfoColumn
4574
311
                        anchors { left: parent.left; top: parent.top; right: parent.right }
4575
312
                        spacing: units.gu(1)
4576
313
4577
314
                        UbuntuShapeForItem {
4578
315
                            Layout.preferredHeight: Math.min(units.gu(6), root.height * .05)
4579
316
                            Layout.preferredWidth: height * 8 / 7.6
4580
317
                            image: Image {
4581
318
                                anchors.fill: parent
4582
319
                                source: model.application.icon
4583
320
                                Rectangle {
4584
321
                                    anchors.fill: parent
4585
322
                                    color: "black"
4586
323
                                    opacity: clippedSpreadDelegate.highlightShown ? 0 : .1
4587
324
                                    Behavior on opacity {
4588
325
                                        UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
4589
326
                                    }
4590
327
                                }
4591
328
                            }
4592
329
                        }
4593
330
                        Label {
4594
331
                            Layout.fillWidth: true
4595
332
                            Layout.preferredHeight: units.gu(6)
4596
333
                            text: model.application ? model.application.name : spreadDelegate.windowTitle
4597
334
                            wrapMode: Text.WordWrap
4598
335
                            elide: Text.ElideRight
4599
336
                            maximumLineCount: 2
4600
337
                        }
4601
338
                    }
4602
339
                }
4603
340
4604
341
                Image {
4605
342
                    id: closeImage
4606
343
                    anchors { left: parent.left; top: parent.top; leftMargin: -height / 2; topMargin: -height / 2 + spreadMaths.closeIconOffset + units.gu(2) }
4607
344
                    source: "graphics/window-close.svg"
4608
345
                    readonly property var mousePos: hoverMouseArea.mapToItem(spreadDelegate, hoverMouseArea.mouseX, hoverMouseArea.mouseY)
4609
346
                    visible: index == spreadRepeater.highlightedIndex
4610
347
                             && mousePos.y < (clippedSpreadDelegate.height / 3)
4611
348
                             && mousePos.y > -units.gu(4)
4612
349
                             && mousePos.x > -units.gu(4)
4613
350
                             && mousePos.x < (clippedSpreadDelegate.width * 2 / 3)
4614
351
                    height: units.gu(1.5)
4615
352
                    width: height
4616
353
                    sourceSize.width: width
4617
354
                    sourceSize.height: height
4618
355
4619
356
                    MouseArea {
4620
357
                        id: closeMouseArea
4621
358
                        objectName: "closeMouseArea"
4622
359
                        anchors.fill: closeImage
4623
360
                        anchors.margins: -units.gu(2)
4624
361
                        onClicked: {
4625
362
                            spreadRepeater.closingIndex = index;
4626
363
                            model.surface.close();
4627
364
                        }
4628
365
                    }
4629
366
                }
4630
367
            }
4631
368
        }
4632
369
    }
4633
370
4634
371
4635
372
    MouseArea {
4636
373
        id: hoverMouseArea
4637
374
        objectName: "hoverMouseArea"
4638
375
        anchors.fill: spreadContainer
4639
376
        propagateComposedEvents: true
4640
377
        hoverEnabled: true
4641
378
        enabled: false
4642
379
        visible: enabled
4643
380
4644
381
        property int scrollAreaWidth: root.width / 3
4645
382
        property bool progressiveScrollingEnabled: false
4646
383
4647
384
        onMouseXChanged: {
4648
385
            mouse.accepted = false
4649
386
4650
387
            if (hoverMouseArea.pressed) {
4651
388
                return;
4652
389
            }
4653
390
4654
391
            // Find the hovered item and mark it active
4655
392
            var mapped = mapToItem(spreadContainer, hoverMouseArea.mouseX, hoverMouseArea.mouseY)
4656
393
            var itemUnder = spreadContainer.childAt(mapped.x, mapped.y)
4657
394
            if (itemUnder) {
4658
395
                mapped = mapToItem(itemUnder, hoverMouseArea.mouseX, hoverMouseArea.mouseY)
4659
396
                var delegateChild = itemUnder.childAt(mapped.x, mapped.y)
4660
397
                if (delegateChild && (delegateChild.objectName === "clippedSpreadDelegate" || delegateChild.objectName === "tileInfo")) {
4661
398
                    spreadRepeater.highlightedIndex = spreadRepeater.indexOf(itemUnder)
4662
399
                }
4663
400
            }
4664
401
4665
402
            if (spreadFlickable.contentWidth > spreadFlickable.minContentWidth) {
4666
403
                var margins = spreadFlickable.width * 0.05;
4667
404
4668
405
                if (!progressiveScrollingEnabled && mouseX < spreadFlickable.width - scrollAreaWidth) {
4669
406
                    progressiveScrollingEnabled = true
4670
407
                }
4671
408
4672
409
                // do we need to scroll?
4673
410
                if (mouseX < scrollAreaWidth + margins) {
4674
411
                    var progress = Math.min(1, (scrollAreaWidth + margins - mouseX) / (scrollAreaWidth - margins));
4675
412
                    var contentX = (1 - progress) * (spreadFlickable.contentWidth - spreadFlickable.width)
4676
413
                    spreadFlickable.contentX = Math.max(0, Math.min(spreadFlickable.contentX, contentX))
4677
414
                }
4678
415
                if (mouseX > spreadFlickable.width - scrollAreaWidth && progressiveScrollingEnabled) {
4679
416
                    var progress = Math.min(1, (mouseX - (spreadFlickable.width - scrollAreaWidth)) / (scrollAreaWidth - margins))
4680
417
                    var contentX = progress * (spreadFlickable.contentWidth - spreadFlickable.width)
4681
418
                    spreadFlickable.contentX = Math.min(spreadFlickable.contentWidth - spreadFlickable.width, Math.max(spreadFlickable.contentX, contentX))
4682
419
                }
4683
420
            }
4684
421
        }
4685
422
        onPressed: mouse.accepted = false
4686
423
    }
4687
424
4688
425
    FloatingFlickable {
4689
426
        id: spreadFlickable
4690
427
        objectName: "spreadFlickable"
4691
428
        anchors.fill: parent
4692
429
        property int minContentWidth: 6 * Math.min(height / 4, width / 5)
4693
430
        contentWidth: Math.max(6, topLevelSurfaceList.count) * Math.min(height / 4, width / 5)
4694
431
        enabled: false
4695
432
4696
433
        function snapTo(contentX) {
4697
434
            snapAnimation.stop();
4698
435
            snapAnimation.to = contentX
4699
436
            snapAnimation.start();
4700
437
        }
4701
438
4702
439
        UbuntuNumberAnimation {
4703
440
            id: snapAnimation
4704
441
            target: spreadFlickable
4705
442
            property: "contentX"
4706
443
        }
4707
444
    }
4708
445
4709
446
    Item {
4710
447
        id: workspaceSelector
4711
448
        anchors {
4712
449
            left: parent.left
4713
450
            top: parent.top
4714
451
            right: parent.right
4715
452
            topMargin: units.gu(3.5)
4716
453
        }
4717
454
        height: root.height * 0.25
4718
455
        visible: false
4719
456
4720
457
        RowLayout {
4721
458
            anchors.fill: parent
4722
459
            spacing: units.gu(1)
4723
460
            Item { Layout.fillWidth: true }
4724
461
            Repeater {
4725
462
                model: 1 // TODO: will be a workspacemodel in the future
4726
463
                Item {
4727
464
                    Layout.fillHeight: true
4728
465
                    Layout.preferredWidth: ((height - units.gu(6)) * root.width / root.height)
4729
466
                    Image {
4730
467
                        source: root.background
4731
468
                        anchors {
4732
469
                            left: parent.left
4733
470
                            right: parent.right
4734
471
                            verticalCenter: parent.verticalCenter
4735
472
                        }
4736
473
                        height: parent.height * 0.75
4737
474
4738
475
                        ShaderEffect {
4739
476
                            anchors.fill: parent
4740
477
4741
478
                            property var source: ShaderEffectSource {
4742
479
                                id: shaderEffectSource
4743
480
                                sourceItem: root.workspace
4744
481
                            }
4745
482
4746
483
                            fragmentShader: "
4747
484
                                varying highp vec2 qt_TexCoord0;
4748
485
                                uniform sampler2D source;
4749
486
                                void main(void)
4750
487
                                {
4751
488
                                    highp vec4 sourceColor = texture2D(source, qt_TexCoord0);
4752
489
                                    gl_FragColor = sourceColor;
4753
490
                                }"
4754
491
                        }
4755
492
                    }
4756
493
4757
494
                    // TODO: This is the bar for the currently selected workspace
4758
495
                    // Enable this once the workspace stuff is implemented
4759
496
    //                    Rectangle {
4760
497
    //                        anchors { left: parent.left; right: parent.right; bottom: parent.bottom }
4761
498
    //                        height: units.dp(2)
4762
499
    //                        color: theme.palette.normal.focus
4763
500
    //                        visible: index == 0 // TODO: should be active workspace index
4764
501
    //                    }
4765
502
                }
4766
503
4767
504
            }
4768
505
            // TODO: This is the "new workspace" button. Enable this once workspaces are implemented
4769
506
    //            Item {
4770
507
    //                Layout.fillHeight: true
4771
508
    //                Layout.preferredWidth: ((height - units.gu(6)) * root.width / root.height)
4772
509
    //                Rectangle {
4773
510
    //                    anchors {
4774
511
    //                        left: parent.left
4775
512
    //                        right: parent.right
4776
513
    //                        verticalCenter: parent.verticalCenter
4777
514
    //                    }
4778
515
    //                    height: parent.height * 0.75
4779
516
    //                    color: "#22ffffff"
4780
517
4781
518
    //                    Label {
4782
519
    //                        anchors.centerIn: parent
4783
520
    //                        font.pixelSize: parent.height / 2
4784
521
    //                        text: "+"
4785
522
    //                    }
4786
523
    //                }
4787
524
    //            }
4788
525
            Item { Layout.fillWidth: true }
4789
526
        }
4790
527
    }
4791
528
4792
529
    Label {
4793
530
        id: currentSelectedLabel
4794
531
        anchors { bottom: parent.bottom; bottomMargin: root.height * 0.625; horizontalCenter: parent.horizontalCenter }
4795
532
        text: spreadRepeater.highlightedIndex >= 0 ? spreadRepeater.itemAt(spreadRepeater.highlightedIndex).windowTitle: ""
4796
533
        visible: false
4797
534
        fontSize: "large"
4798
535
    }
4799
536
4800
537
    states: [
4801
538
        State {
4802
539
            name: "altTab"; when: root.altTabPressed
4803
540
            PropertyChanges { target: blurLayer; saturation: 0.8; blurRadius: 60; visible: true }
4804
541
            PropertyChanges { target: workspaceSelector; visible: true }
4805
542
            PropertyChanges { target: spreadContainer; visible: true }
4806
543
            PropertyChanges { target: spreadFlickable; enabled: spreadFlickable.contentWidth > spreadFlickable.minContentWidth }
4807
544
            PropertyChanges { target: currentSelectedLabel; visible: true }
4808
545
            PropertyChanges { target: spreadBackground; visible: true }
4809
546
            PropertyChanges { target: hoverMouseArea; enabled: true }
4810
547
        }
4811
548
    ]
4812
549
    transitions: [
4813
550
        Transition {
4814
551
            from: "*"
4815
552
            to: "altTab"
4816
553
            SequentialAnimation {
4817
554
                PropertyAction { target: spreadRepeater; property: "highlightedIndex"; value: Math.min(topLevelSurfaceList.count - 1, 1) }
4818
555
                PauseAnimation { duration: spreadContainer.animateIn ? 0 : 140 }
4819
556
                PropertyAction { target: workspaceSelector; property: "visible" }
4820
557
                PropertyAction { target: spreadContainer; property: "visible" }
4821
558
                ParallelAnimation {
4822
559
                    UbuntuNumberAnimation { target: blurLayer; properties: "saturation,blurRadius"; duration: UbuntuAnimation.SnapDuration }
4823
560
                    PropertyAction { target: spreadFlickable; property: "visible" }
4824
561
                    PropertyAction { targets: [currentSelectedLabel,spreadBackground]; property: "visible" }
4825
562
                    PropertyAction { target: spreadFlickable; property: "contentX"; value: 0 }
4826
563
                }
4827
564
                PropertyAction { target: hoverMouseArea; properties: "enabled,progressiveScrollingEnabled"; value: false }
4828
565
            }
4829
566
        },
4830
567
        Transition {
4831
568
            from: "*"
4832
569
            to: "*"
4833
570
            PropertyAnimation { property: "opacity" }
4834
571
            ScriptAction { script: { root.focusSelected() } }
4835
572
            PropertyAction { target: spreadRepeater; property: "highlightedIndex"; value: -1 }
4836
573
            PropertyAction { target: spreadContainer; property: "animateIn"; value: false }
4837
574
        }
4838
575
    ]
4839
576
}
4840
577
0
4841
=== removed file 'qml/Stages/DesktopSpreadDelegate.qml'
4842
--- qml/Stages/DesktopSpreadDelegate.qml	2016-05-17 20:46:51 +0000
4843
+++ qml/Stages/DesktopSpreadDelegate.qml	1970-01-01 00:00:00 +0000
4844
@@ -1,126 +0,0 @@
4845
1
/*
4846
2
 * Copyright (C) 2014-2016 Canonical, Ltd.
4847
3
 *
4848
4
 * This program is free software; you can redistribute it and/or modify
4849
5
 * it under the terms of the GNU General Public License as published by
4850
6
 * the Free Software Foundation; version 3.
4851
7
 *
4852
8
 * This program is distributed in the hope that it will be useful,
4853
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4854
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4855
11
 * GNU General Public License for more details.
4856
12
 *
4857
13
 * You should have received a copy of the GNU General Public License
4858
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4859
15
 *
4860
16
 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
4861
17
 */
4862
18
4863
19
import QtQuick 2.4
4864
20
import Ubuntu.Components 1.3
4865
21
import Unity.Application 0.1
4866
22
4867
23
Item {
4868
24
    id: root
4869
25
4870
26
    property alias window: applicationWindow
4871
27
    property alias application: applicationWindow.application
4872
28
    property alias surface: applicationWindow.surface
4873
29
4874
30
    property bool highlightShown: false
4875
31
    property real shadowOpacity: 1
4876
32
4877
33
    property int windowWidth: surface ? surface.size.width : 0
4878
34
    property int windowHeight: surface ? surface.size.height : 0
4879
35
4880
36
    state: "normal"
4881
37
    states: [
4882
38
        State {
4883
39
            name: "normal"
4884
40
            PropertyChanges {
4885
41
                target: root
4886
42
                width: windowWidth
4887
43
                height: windowHeight
4888
44
            }
4889
45
        },
4890
46
        State {
4891
47
            name: "transformed"
4892
48
            PropertyChanges {
4893
49
                target: applicationWindow
4894
50
                itemScale: Math.max(root.width / root.windowWidth, root.height / root.windowHeight)
4895
51
                interactive: false
4896
52
            }
4897
53
            PropertyChanges {
4898
54
                target: clipper
4899
55
                clip: true
4900
56
            }
4901
57
        }
4902
58
    ]
4903
59
4904
60
    scale: highlightShown ? 1.025 : 1
4905
61
    Behavior on scale {
4906
62
        UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
4907
63
    }
4908
64
4909
65
    BorderImage {
4910
66
        anchors {
4911
67
            fill: root
4912
68
            margins: -units.gu(2)
4913
69
        }
4914
70
        source: "graphics/dropshadow2gu.sci"
4915
71
        opacity: root.shadowOpacity * .3
4916
72
    }
4917
73
4918
74
    Rectangle {
4919
75
        id: selectionHighlight
4920
76
        anchors.fill: parent
4921
77
        anchors.margins: -units.gu(1)
4922
78
        color: "white"
4923
79
        opacity: highlightShown ? 0.55 : 0
4924
80
        antialiasing: true
4925
81
    }
4926
82
4927
83
    Rectangle {
4928
84
        anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }
4929
85
        height: units.dp(2)
4930
86
        color: theme.palette.normal.focus
4931
87
        visible: root.highlightShown
4932
88
        antialiasing: true
4933
89
    }
4934
90
4935
91
    Item {
4936
92
        id: clipper
4937
93
        anchors.fill: parent
4938
94
4939
95
        ApplicationWindow {
4940
96
            id: applicationWindow
4941
97
            objectName: application ? "appWindow_" + application.appId : "appWindow_null"
4942
98
            anchors.top: parent.top
4943
99
            anchors.topMargin: 0
4944
100
            anchors.left: parent.left
4945
101
            width: root.windowWidth
4946
102
            height: root.windowHeight
4947
103
            interactive: false
4948
104
            resizeSurface: false
4949
105
            focus: false
4950
106
4951
107
            property real itemScale: 1
4952
108
            transform: [
4953
109
                Scale {
4954
110
                    origin.x: 0; origin.y: 0
4955
111
                    xScale: applicationWindow.itemScale
4956
112
                    yScale: applicationWindow.itemScale
4957
113
                }
4958
114
            ]
4959
115
        }
4960
116
    }
4961
117
4962
118
    Rectangle {
4963
119
        anchors.fill: parent
4964
120
        color: "black"
4965
121
        opacity: root.highlightShown ? 0 : .1
4966
122
        Behavior on opacity {
4967
123
            UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
4968
124
        }
4969
125
    }
4970
126
}
4971
127
0
4972
=== removed file 'qml/Stages/PhoneStage.qml'
4973
--- qml/Stages/PhoneStage.qml	2016-08-08 11:18:19 +0000
4974
+++ qml/Stages/PhoneStage.qml	1970-01-01 00:00:00 +0000
4975
@@ -1,806 +0,0 @@
4976
1
/*
4977
2
 * Copyright (C) 2014-2016 Canonical, Ltd.
4978
3
 *
4979
4
 * This program is free software; you can redistribute it and/or modify
4980
5
 * it under the terms of the GNU General Public License as published by
4981
6
 * the Free Software Foundation; version 3.
4982
7
 *
4983
8
 * This program is distributed in the hope that it will be useful,
4984
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4985
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4986
11
 * GNU General Public License for more details.
4987
12
 *
4988
13
 * You should have received a copy of the GNU General Public License
4989
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4990
15
 */
4991
16
4992
17
import QtQuick 2.4
4993
18
import Ubuntu.Components 1.3
4994
19
import Ubuntu.Gestures 0.1
4995
20
import Unity.Application 0.1
4996
21
import Unity.Session 0.1
4997
22
import Utils 0.1
4998
23
import Powerd 0.1
4999
24
import "../Components"
5000
25
Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2016-10-05	Approve on 2016-10-12
Unity8 CI Bot	continuous-integration	2016-10-05	Needs Fixing on 2016-10-10
Daniel d'Andrada (community)		2016-10-05	Needs Information on 2016-10-07
Review via email: mp+307720@code.launchpad.net