Merge lp:~dandrader/ubuntu-keyboard/fixAngleToOrientationMap into lp:ubuntu-keyboard

[Daniel d'Andrada]

Fixes mapping between rotation angles and screen orientations

Code was assuming that primary screen orientation was always landscape.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:133
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/324/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/153
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/153/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/152

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/324/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

NOTE depends on: https://code.launchpad.net/~dandrader/ubuntu/trusty/maliit-framework/orientationAngleMapping/+merge/204304

[Bill Filler (bfiller)]

tested with https://code.launchpad.net/~dandrader/ubuntu/trusty/maliit-framework/orientationAngleMapping/+merge/204304 and worked as expected on tablet and N4

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
YES

Did you successfully run all tests found in your component's Test Plan
(https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
YES

Did CI run pass? If not, please explain why.
YES

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
YES

review: Approve

[Bill Filler (bfiller)]

Are there any related MPs required for this MP to build/function as expected?
Yes, https://code.launchpad.net/~dandrader/ubuntu/trusty/maliit-framework/orientationAngleMapping/+merge/204304

[Sergio Schvezov (sergiusens)]

for the ci train, just create them in the same silo.

On Fri, Jan 31, 2014 at 8:18 PM, Bill Filler <email address hidden> wrote:
> NOTE depends on: https://code.launchpad.net/~dandrader/ubuntu/trusty/maliit-framework/orientationAngleMapping/+merge/204304
> --
> https://code.launchpad.net/~dandrader/ubuntu-keyboard/fixAngleToOrientationMap/+merge/204293
> Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~dandrader/ubuntu-keyboard/fixAngleToOrientationMap into lp:ubuntu-keyboard.

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2014-01-23 16:42:33 +0000
+++ src/plugin/inputmethod.cpp	2014-01-31 17:30:18 +0000
@@ -57,6 +57,32 @@
 
 namespace {
 
+Qt::ScreenOrientation rotationAngleToScreenOrientation(int angle)
+{
+    bool portraitIsPrimary = QGuiApplication::primaryScreen()->primaryOrientation()
+        == Qt::PortraitOrientation;
+
+    switch (angle) {
+        case 0:
+            return portraitIsPrimary ? Qt::PortraitOrientation
+                                     : Qt::LandscapeOrientation;
+            break;
+        case 90:
+            return portraitIsPrimary ? Qt::InvertedLandscapeOrientation
+                                     : Qt::PortraitOrientation;
+            break;
+        case 180:
+            return portraitIsPrimary ? Qt::InvertedPortraitOrientation
+                                     : Qt::InvertedLandscapeOrientation;
+            break;
+        case 270:
+        default:
+            return portraitIsPrimary ? Qt::LandscapeOrientation
+                                     : Qt::InvertedPortraitOrientation;
+            break;
+    }
+}
+
 const QString g_maliit_keyboard_qml(UBUNTU_KEYBOARD_DATA_DIR "/Keyboard.qml");
 
 Key overrideToKey(const SharedOverride &override)
@@ -173,18 +199,7 @@
 {
     Q_D(InputMethod);
 
-    switch (angle) {
-        case 0:
-            d->appsCurrentOrientation = Qt::LandscapeOrientation; break;
-    case 90:
-            d->appsCurrentOrientation = Qt::InvertedPortraitOrientation; break;
-        case 180:
-            d->appsCurrentOrientation = Qt::InvertedLandscapeOrientation; break;
-        case 270:
-        default:
-            d->appsCurrentOrientation = Qt::PortraitOrientation; break;
-    }
-
+    d->appsCurrentOrientation = rotationAngleToScreenOrientation(angle);
     d->setLayoutOrientation(d->appsCurrentOrientation);
 }