Merge lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-orientation-2 into lp:ubuntu-keyboard

[Thomas Moenicke]

improves orientation changing behavior when osk is hidden, fixes #1213127

improves orientation changing behavior when osk is hidden, fixes #1213127

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:48
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/111/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-amd64-ci/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/111
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/111/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-i386-ci/111

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

review: Approve (continuous-integration)

[lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-orientation-2]

49. By Thomas Moenicke on 2013-09-30

rebased to trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/115/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-amd64-ci/116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/115
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/115/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-i386-ci/115

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

review: Approve (continuous-integration)

[Thomas Moenicke (thomas-moenicke)]

tested on tablet and galaxy nexus. Orientation works fine, OSK is at the edge of the screen also on tablet.

[Günter Schwann (schwann)]

looks good, and works

review: Approve

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2013-09-26 10:55:56 +0000
+++ src/plugin/inputmethod.cpp	2013-09-30 12:07:33 +0000
@@ -111,7 +111,7 @@
 
     // Setting layout orientation depends on word engine and hide word ribbon
     // settings to be initialized first:
-    d->updateKeyboardOrientation();
+    d->setLayoutOrientation(d->appsCurrentOrientation);
 }
 
 InputMethod::~InputMethod()
@@ -216,20 +216,19 @@
 {
     Q_D(InputMethod);
 
-    Qt::ScreenOrientation orientation = Qt::PortraitOrientation;
     switch (angle) {
         case 0:
-            orientation = Qt::LandscapeOrientation; break;
+            d->appsCurrentOrientation = Qt::LandscapeOrientation; break;
     case 90:
-            orientation = Qt::InvertedPortraitOrientation; break;
+            d->appsCurrentOrientation = Qt::InvertedPortraitOrientation; break;
         case 180:
-            orientation = Qt::InvertedLandscapeOrientation; break;
+            d->appsCurrentOrientation = Qt::InvertedLandscapeOrientation; break;
         case 270:
         default:
-            orientation = Qt::PortraitOrientation; break;
+            d->appsCurrentOrientation = Qt::PortraitOrientation; break;
     }
 
-    d->setLayoutOrientation(orientation);
+    d->setLayoutOrientation(d->appsCurrentOrientation);
 }
 
 bool InputMethod::imExtensionEvent(MImExtensionEvent *event)
@@ -340,7 +339,7 @@
     Q_UNUSED(orientation);
     Q_D(InputMethod);
 
-    d->updateKeyboardOrientation();
+    d->setLayoutOrientation(d->appsCurrentOrientation);
 }
 
 void InputMethod::update()

=== modified file 'src/plugin/inputmethod_p.h'
--- src/plugin/inputmethod_p.h	2013-09-26 10:55:56 +0000
+++ src/plugin/inputmethod_p.h	2013-09-30 12:07:33 +0000
@@ -91,6 +91,7 @@
     bool predictionEnabled;
     Maliit::TextContentType contentType;
     QString activeLanguageId;
+    Qt::ScreenOrientation appsCurrentOrientation;
 
     KeyboadSettings m_settings;
 
@@ -111,6 +112,7 @@
         , predictionEnabled(false)
         , contentType(Maliit::FreeTextContentType)
         , activeLanguageId("en_us")
+        , appsCurrentOrientation(qGuiApp->primaryScreen()->orientation())
         , m_settings()
     {
         view = createWindow(host);
@@ -237,18 +239,13 @@
         }
     }
 
-    void updateKeyboardOrientation()
-    {
-        setLayoutOrientation(QGuiApplication::primaryScreen()->orientation());
-    }
-
     void updateWordRibbon()
     {
         layout.helper.wordRibbon()->setEnabled( predictionEnabled );
         Q_EMIT q->wordRibbonEnabledChanged( predictionEnabled );
         qmlRootItem->setProperty("wordribbon_visible", predictionEnabled );
 
-        updateKeyboardOrientation();
+        setLayoutOrientation(appsCurrentOrientation);
     }
 
     /*
@@ -342,10 +339,6 @@
     void onScreenSizeChange(const QSize &size)
     {
         layout.helper.setScreenSize(size);
-
-    #ifdef TEMP_DISABLED
-        updateKeyboardOrientation();
-    #endif
     }
 
     void closeOskWindow()