1
=== modified file 'qml/Stage/Stage.qml'
2
--- qml/Stage/Stage.qml	2017-01-03 12:04:08 +0000
3
+++ qml/Stage/Stage.qml	2017-01-25 18:24:35 +0000
4
@@ -1412,11 +1412,12 @@
5
1412
                        name: "minimized"; when: appDelegate.minimized
1412
                        name: "minimized"; when: appDelegate.minimized
6
1413
                        PropertyChanges {
1413
                        PropertyChanges {
7
1414
                            target: appDelegate
1414
                            target: appDelegate
8
1415
                            requestedX: -appDelegate.width / 2
9
1416
                            scale: units.gu(5) / appDelegate.width
1415
                            scale: units.gu(5) / appDelegate.width
10
1417
                            opacity: 0;
1416
                            opacity: 0;
11
1418
                            visuallyMinimized: true
1417
                            visuallyMinimized: true
12
1419
                            visuallyMaximized: false
1418
                            visuallyMaximized: false
13
1419
                            x: -appDelegate.width / 2
14
1420
                            y: root.height / 2
15
1420
                        }
1421
                        }
16
1421
                    }
1422
                    }
17
1422
                ]
1423
                ]
18
@@ -1433,15 +1434,6 @@
19
1433
                        UbuntuNumberAnimation { target: appDelegate; properties: "x,y,requestedX,requestedY,requestedWidth,requestedHeight"; duration: priv.animationDuration}
1434
                        UbuntuNumberAnimation { target: appDelegate; properties: "x,y,requestedX,requestedY,requestedWidth,requestedHeight"; duration: priv.animationDuration}
20
1434
                    },
1435
                    },
21
1435
                    Transition {
1436
                    Transition {
22
1436
                        to: "minimized"
23
1437
                        enabled: appDelegate.animationsEnabled
24
1438
                        PropertyAction { target: appDelegate; property: "visuallyMaximized" }
25
1439
                        SequentialAnimation {
26
1440
                            UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,opacity,scale,requestedWidth,requestedHeight" }
27
1441
                            PropertyAction { target: appDelegate; property: "visuallyMinimized" }
28
1442
                        }
29
1443
                    },
30
1444
                    Transition {
31
1445
                        to: "spread"
1437
                        to: "spread"
32
1446
                        // DecoratedWindow wants the scaleToPreviewSize set before enabling scaleToPreview
1438
                        // DecoratedWindow wants the scaleToPreviewSize set before enabling scaleToPreview
33
1447
                        PropertyAction { target: appDelegate; properties: "z,visible" }
1439
                        PropertyAction { target: appDelegate; properties: "z,visible" }
34
@@ -1490,6 +1482,31 @@
35
1490
                        }
1482
                        }
36
1491
                    },
1483
                    },
37
1492
                    Transition {
1484
                    Transition {
38
1485
                        from: ",normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"
39
1486
                        to: "minimized"
40
1487
                        SequentialAnimation {
41
1488
                            ScriptAction { script: print("transitioning:", appDelegate.x, appDelegate.y, appDelegate.scale) }
42
1489
                            ScriptAction { script: { fakeRectangle.stop(); } }
43
1490
                            PropertyAction { target: appDelegate; property: "visuallyMaximized" }
44
1491
                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,scale,opacity"; duration: priv.animationDuration }
45
1492
                            PropertyAction { target: appDelegate; property: "visuallyMinimized" }
46
1493
                        }
47
1494
                    },
48
1495
                    Transition {
49
1496
                        from: "minimized"
50
1497
                        to: ",normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"
51
1498
                        SequentialAnimation {
52
1499
                            ScriptAction { script: print("transitioning:", appDelegate.x, appDelegate.y, appDelegate.scale) }
53
1500
                            PropertyAction { target: appDelegate; property: "visuallyMinimized,z" }
54
1501
                            ParallelAnimation {
55
1502
                                UbuntuNumberAnimation { target: appDelegate; properties: "x"; from: -appDelegate.width / 2; duration: priv.animationDuration }
56
1503
                                UbuntuNumberAnimation { target: appDelegate; properties: "y,opacity"; duration: priv.animationDuration }
57
1504
                                UbuntuNumberAnimation { target: appDelegate; properties: "scale"; from: 0; duration: priv.animationDuration }
58
1505
                            }
59
1506
                            PropertyAction { target: appDelegate; property: "visuallyMaximized" }
60
1507
                        }
61
1508
                    },
62
1509
                    Transition {
63
1493
                        id: windowedTransition
1510
                        id: windowedTransition
64
1494
                        from: ",normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen,minimized"
1511
                        from: ",normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen,minimized"
65
1495
                        to: ",normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"
1512
                        to: ",normal,restored,maximized,maximizedLeft,maximizedRight,maximizedTopLeft,maximizedTopRight,maximizedBottomLeft,maximizedBottomRight,maximizedHorizontally,maximizedVertically,fullscreen"
66
@@ -1642,7 +1659,6 @@
67
1642
                    onClicked: {
1659
                    onClicked: {
68
1643
                        spreadItem.highlightedIndex = index;
1660
                        spreadItem.highlightedIndex = index;
69
1644
                        if (distance == 0) {
1661
                        if (distance == 0) {
70
1645
                            model.window.activate();
71
1646
                            priv.goneToSpread = false;
1662
                            priv.goneToSpread = false;
72
1647
                        }
1663
                        }
73
1648
                    }
1664
                    }
Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2017-01-25	Approve on 2017-01-30
Unity8 CI Bot	continuous-integration		Approve on 2017-01-30
Review via email: mp+315548@code.launchpad.net