Merge lp:~tpeeters/ubuntu-ui-toolkit/fixOskAnchors into lp:ubuntu-ui-toolkit

[Tim Peeters]

Revert speed optimizations for orientation changes which caused an OSK anchoring regression.

[Zoltan Balogh (bzoltan)]

OK

review: Approve

[Zoltan Balogh (bzoltan)]

kaleo has better solution

review: Disapprove

[Florian Boucault (fboucault)]

https://code.launchpad.net/~fboucault/ubuntu-ui-toolkit/fix_overlap_osk/+merge/226286 overrides it

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1053
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2106/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1795/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1513
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/52/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2058/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2872
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2872/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9610
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1700
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1700/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2106/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

1053. By Tim Peeters on 2014-07-10

link bugs

1052. By Tim Peeters on 2014-07-10

revert r1109 of staging

1051. By Tim Peeters on 2014-07-10

revert r1112 of staging

=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
--- modules/Ubuntu/Components/OrientationHelper.qml	2014-06-18 08:23:20 +0000
+++ modules/Ubuntu/Components/OrientationHelper.qml	2014-07-10 10:54:10 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.0
 import QtQuick.Window 2.0
 import Ubuntu.Components 1.0
 
@@ -136,17 +136,6 @@
                     target: orientationHelper
                     rotation: 0
                 }
-                StateChangeScript {
-                    name: "anchorsScript"
-                    script: {
-                        orientationHelper.anchors.fill = null;
-                        orientationHelper.anchors.leftMargin = 0;
-                        orientationHelper.anchors.rightMargin = 0;
-                        orientationHelper.anchors.topMargin = 0;
-                        orientationHelper.anchors.bottomMargin = 0;
-                        orientationHelper.anchors.fill = orientationHelper.parent;
-                    }
-                }
             },
             State {
                 name: "180"
@@ -154,33 +143,17 @@
                     target: orientationHelper
                     rotation: 180
                 }
-                StateChangeScript {
-                    name: "anchorsScript"
-                    script: {
-                        orientationHelper.anchors.fill = null;
-                        orientationHelper.anchors.leftMargin = 0;
-                        orientationHelper.anchors.rightMargin = 0;
-                        orientationHelper.anchors.topMargin = 0;
-                        orientationHelper.anchors.bottomMargin = 0;
-                        orientationHelper.anchors.fill = orientationHelper.parent;
-                    }
-                }
             },
             State {
                 name: "270"
                 PropertyChanges {
                     target: orientationHelper
                     rotation: 270
-                }
-                StateChangeScript {
-                    name: "anchorsScript"
-                    script: {
-                        orientationHelper.anchors.fill = null;
-                        orientationHelper.anchors.topMargin = Qt.binding(function() {return -(parent.width - parent.height) / 2});
-                        orientationHelper.anchors.bottomMargin = Qt.binding(function() {return -(parent.width - parent.height) / 2});
-                        orientationHelper.anchors.leftMargin = Qt.binding(function() {return (parent.width - parent.height) / 2});
-                        orientationHelper.anchors.rightMargin = Qt.binding(function() {return (parent.width - parent.height) / 2});
-                        orientationHelper.anchors.fill = orientationHelper.parent;
+                    anchors {
+                        leftMargin: (parent.width - parent.height) / 2
+                        rightMargin: anchors.leftMargin
+                        topMargin: -anchors.leftMargin
+                        bottomMargin: anchors.topMargin
                     }
                 }
             },
@@ -189,16 +162,11 @@
                 PropertyChanges {
                     target: orientationHelper
                     rotation: 90
-                }
-                StateChangeScript {
-                    name: "anchorsScript"
-                    script: {
-                        orientationHelper.anchors.fill = null;
-                        orientationHelper.anchors.topMargin = Qt.binding(function() {return -(parent.width - parent.height) / 2});
-                        orientationHelper.anchors.bottomMargin = Qt.binding(function() {return -(parent.width - parent.height) / 2});
-                        orientationHelper.anchors.leftMargin = Qt.binding(function() {return (parent.width - parent.height) / 2});
-                        orientationHelper.anchors.rightMargin = Qt.binding(function() {return (parent.width - parent.height) / 2});
-                        orientationHelper.anchors.fill = orientationHelper.parent;
+                    anchors {
+                        leftMargin: (parent.width - parent.height) / 2
+                        rightMargin: anchors.leftMargin
+                        topMargin: -anchors.leftMargin
+                        bottomMargin: anchors.topMargin
                     }
                 }
             }
@@ -208,20 +176,18 @@
             Transition {
                 id: orientationTransition
                 ParallelAnimation {
-                    /* FIXME: this is a workaround for 2 issues that trigger too many changes
-                              to the width and height of orientationHelper which creates intermediary
-                              states of the UI with unexpected sizes:
-                        1) upon state change fast-forwarding is used which means that the final values are computed and applied
-                          then immediately reverted before the actual transition is applied
-                        2) when margins are applied, width and height are updated separately
-
-                        Without these issues, regular PropertyChanges could be used to set the margins.
-                    */
-                    ScriptAction {
-                        scriptName: "anchorsScript"
+                    SequentialAnimation {
+                        PauseAnimation {
+                            duration: 25
+                        }
+                        PropertyAction {
+                            target: orientationHelper
+                            properties: "anchors.topMargin,anchors.bottomMargin,anchors.rightMargin,anchors.leftMargin"
+                        }
                     }
-                    RotationAnimator {
+                    RotationAnimation {
                         target: orientationHelper
+                        properties: "rotation"
                         duration: UbuntuAnimation.FastDuration
                         easing: UbuntuAnimation.StandardEasing
                         direction: RotationAnimation.Shortest