git.iko.soy/unity8
on xenial help sign in
Fix missing screenshot when orientation changes while shell rotation ongoing
a53d875Daniel d'Andrada
qml/Rotation/HalfLoopRotationAnimation.qml+1−1
compare with xenial
unifiedsplit
@@ -42,6 +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+ UpdateShellTransformations { shell: root.shell; rotationAngle: root.toAngle }
46 ScriptAction { script: { info.transitioning = false; } }
46 ScriptAction { script: { info.transitioning = false; } }
47}
47}
qml/Rotation/ImmediateRotationAction.qml+1−1
@@ -25,7 +25,7 @@ SequentialAnimation {
25 root.info.transitioning = true;
25 root.info.transitioning = true;
26 } }
26 } }
27
27
28− UpdateShellTransformations { info: root.info; shell: root.shell }
28+ UpdateShellTransformations { shell: root.shell; rotationAngle: root.info.requestedOrientationAngle }
29
29
30 ScriptAction { script: {
30 ScriptAction { script: {
31 root.shell.updateFocusedAppOrientation();
31 root.shell.updateFocusedAppOrientation();
qml/Rotation/NinetyRotationAnimation.qml+1−1
@@ -78,7 +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+ UpdateShellTransformations { shell: root.shell; rotationAngle: root.toAngle }
82 ScriptAction { script: {
82 ScriptAction { script: {
83 shellSnapshot.visible = false;
83 shellSnapshot.visible = false;
84 shellSnapshot.discard();
84 shellSnapshot.discard();
qml/Rotation/UpdateShellTransformations.qml+4−4
@@ -17,16 +17,16 @@
17import QtQuick 2.4
17import QtQuick 2.4
18
18
19ScriptAction {
19ScriptAction {
20− property var info
21 property var shell
20 property var shell
21+ property int rotationAngle
22
22
23 script: {
23 script: {
24− shell.orientationAngle = info.requestedOrientationAngle;
24+ shell.orientationAngle = rotationAngle;
25− shell.transformRotationAngle = info.requestedOrientationAngle;
25+ shell.transformRotationAngle = rotationAngle;
26
26
27 // They must all be bindings as orientedShell's size can change
27 // They must all be bindings as orientedShell's size can change
28
28
29− if (info.requestedOrientationAngle === 90 || info.requestedOrientationAngle === 270) {
29+ if (rotationAngle === 90 || rotationAngle === 270) {
30 shell.width = Qt.binding(function() { return orientedShell.height; });
30 shell.width = Qt.binding(function() { return orientedShell.height; });
31 shell.height = Qt.binding(function() { return orientedShell.width; });
31 shell.height = Qt.binding(function() { return orientedShell.width; });
32 } else {
32 } else {