52ea9a1 · unity8 · git.iko.soy

git.iko.soy/unity8

Ensure shell transformations use bindings as OrientedShell can get resized

commit52ea9a123c53c6826edabaffec228dce932afd01 authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateFri 29 Apr 2016, 09:55 (10 years ago) parentfa119b3

4 files changed+56−23

compare with xenial

unifiedsplit

qml/Rotation/HalfLoopRotationAnimation.qml+2−1 qml/Rotation/ImmediateRotationAction.qml+11−22 qml/Rotation/NinetyRotationAnimation.qml+1 qml/Rotation/UpdateShellTransformations.qml+42

qml/Rotation/HalfLoopRotationAnimation.qml+2−1

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -42,5 +42,6 @@ SequentialAnimation {

4242 from: root.fromAngle; to: root.toAngle

4343 duration: rotationDuration; easing.type: rotationEasing

4444 }

45+ UpdateShellTransformations { info: root.info; shell: root.shell }

4546 ScriptAction { script: { info.transitioning = false; } }

4647}

qml/Rotation/ImmediateRotationAction.qml+11−22

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -16,30 +16,19 @@

1616

1717import QtQuick 2.4

1818

19−ScriptAction {

19+SequentialAnimation {

20+ id: root

2021 property var info

2122 property var shell

2223

23− script: {

24− info.transitioning = true;

25− shell.orientationAngle = info.requestedOrientationAngle;

26− shell.transformRotationAngle = info.requestedOrientationAngle;

24+ ScriptAction { script: {

25+ root.info.transitioning = true;

26+ } }

2727

28− // Making bindings as orientedShell's dimensions might wiggle during startup.

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− }

28+ UpdateShellTransformations { info: root.info; shell: root.shell }

3629

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− shell.updateFocusedAppOrientation();

43− info.transitioning = false;

44− }

30+ ScriptAction { script: {

31+ root.shell.updateFocusedAppOrientation();

32+ root.info.transitioning = false;

33+ } }

4534}

qml/Rotation/NinetyRotationAnimation.qml+1

@@ -78,6 +78,7 @@ SequentialAnimation {

7878 duration: rotationDuration; easing.type: rotationEasing

7979 }

8080 }

81+ UpdateShellTransformations { info: root.info; shell: root.shell }

8182 ScriptAction { script: {

8283 shellSnapshot.visible = false;

8384 shellSnapshot.discard();

qml/Rotation/UpdateShellTransformations.qmlnew file+42

@@ -0,0 +1,42 @@

1+/*

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+}