git.iko.soy/unity8
on xenial help sign in
Ensure shell transformations use bindings as OrientedShell can get resized
986c383Daniel d'Andrada
qml/Rotation/HalfLoopRotationAnimation.qml+2−1
compare with xenial
unifiedsplit
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2015 Canonical, Ltd.
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -42,5 +42,6 @@ SequentialAnimation {
42 from: root.fromAngle; to: root.toAngle
42 from: root.fromAngle; to: root.toAngle
43 duration: rotationDuration; easing.type: rotationEasing
43 duration: rotationDuration; easing.type: rotationEasing
44 }
44 }
45+ UpdateShellTransformations { info: root.info; shell: root.shell }
45 ScriptAction { script: { info.transitioning = false; } }
46 ScriptAction { script: { info.transitioning = false; } }
46}
47}
qml/Rotation/ImmediateRotationAction.qml+11−22
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2015 Canonical, Ltd.
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -16,30 +16,19 @@
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18
18
19−ScriptAction {
19+SequentialAnimation {
20+ id: root
20 property var info
21 property var info
21 property var shell
22 property var shell
22
23
23− script: {
24+ ScriptAction { script: {
24− info.transitioning = true;
25+ root.info.transitioning = true;
25− shell.orientationAngle = info.requestedOrientationAngle;
26+ } }
26− shell.transformRotationAngle = info.requestedOrientationAngle;
27
27
28− // Making bindings as orientedShell's dimensions might wiggle during startup.
28+ UpdateShellTransformations { info: root.info; shell: root.shell }
29− if (info.requestedOrientationAngle === 90 || info.requestedOrientationAngle === 270) {
30− shell.width = Qt.binding(function() { return orientedShell.height; });
31− shell.height = Qt.binding(function() { return orientedShell.width; });
32− } else {
33− shell.width = Qt.binding(function() { return orientedShell.width; });
34− shell.height = Qt.binding(function() { return orientedShell.height; });
35− }
36
29
37− shell.x = Qt.binding(function() { return (orientedShell.width - shell.width) / 2; });
30+ ScriptAction { script: {
38− shell.y = Qt.binding(function() { return (orientedShell.height - shell.height) / 2; });
39− shell.transformOriginX = Qt.binding(function() { return shell.width / 2; });
40− shell.transformOriginY = Qt.binding(function() { return shell.height / 2; });
41−
42− shell.updateFocusedAppOrientation();
31+ root.shell.updateFocusedAppOrientation();
43− info.transitioning = false;
32+ root.info.transitioning = false;
44− }
33+ } }
45}
34}
qml/Rotation/NinetyRotationAnimation.qml+1
@@ -78,6 +78,7 @@ SequentialAnimation {
78 duration: rotationDuration; easing.type: rotationEasing
78 duration: rotationDuration; easing.type: rotationEasing
79 }
79 }
80 }
80 }
81+ UpdateShellTransformations { info: root.info; shell: root.shell }
81 ScriptAction { script: {
82 ScriptAction { script: {
82 shellSnapshot.visible = false;
83 shellSnapshot.visible = false;
83 shellSnapshot.discard();
84 shellSnapshot.discard();
qml/Rotation/UpdateShellTransformations.qmlnew file+42
@@ -0,0 +1,42 @@
1+/*
2+ * Copyright (C) 2016 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.4
18+
19+ScriptAction {
20+ property var info
21+ property var shell
22+
23+ script: {
24+ shell.orientationAngle = info.requestedOrientationAngle;
25+ shell.transformRotationAngle = info.requestedOrientationAngle;
26+
27+ // They must all be bindings as orientedShell's size can change
28+
29+ if (info.requestedOrientationAngle === 90 || info.requestedOrientationAngle === 270) {
30+ shell.width = Qt.binding(function() { return orientedShell.height; });
31+ shell.height = Qt.binding(function() { return orientedShell.width; });
32+ } else {
33+ shell.width = Qt.binding(function() { return orientedShell.width; });
34+ shell.height = Qt.binding(function() { return orientedShell.height; });
35+ }
36+
37+ shell.x = Qt.binding(function() { return (orientedShell.width - shell.width) / 2; });
38+ shell.y = Qt.binding(function() { return (orientedShell.height - shell.height) / 2; });
39+ shell.transformOriginX = Qt.binding(function() { return shell.width / 2; });
40+ shell.transformOriginY = Qt.binding(function() { return shell.height / 2; });
41+ }
42+}