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