Merge lp:~dandrader/unity-mir/osk_rotation_lp1236489 into lp:unity-mir

[Daniel d'Andrada]

UbuntuKeyboardInfo now provides the opaque keybard area in scene coordinates

So all that's left for OSKController is setting its InputArea to match it.
No more guesswork anymore.

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-mir-ci/118/rebuild

review: Approve (continuous-integration)

[lp:~dandrader/unity-mir/osk_rotation_lp1236489]

123. By Daniel d'Andrada on 2013-10-14

UbuntuKeyboardInfo now provides the opaque keybard area in scene coordinates

So all that's left for OSKController is setting its InputArea to match it.
No more guesswork anymore!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:123
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/120/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/120
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/120

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-mir-ci/120/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

LGTM. Will top approve once https://code.launchpad.net/~dandrader/ubuntu-keyboard/osk_rotation_lp1236489/+merge/190946 is approved

review: Approve

[Gerry Boland (gerboland)]

Dependent approved, approving this too

review: Approve

=== modified file 'src/modules/Unity/Application/OSKController.qml'
--- src/modules/Unity/Application/OSKController.qml	2013-10-09 21:03:57 +0000
+++ src/modules/Unity/Application/OSKController.qml	2013-10-14 18:42:48 +0000
@@ -48,61 +48,17 @@
         anchors.fill: oskInputArea
     }
 
-    /* Need to position InputArea of oskSurface to cover the keyboard. But as shell
-       currently has no idea the shape of the OSK (since OSK draws inside a fullscreen
-       surface) we have to do guesswork so that the InputArea is correctly placed */
+    /* Need to position InputArea of oskSurface to cover the keyboard. */
     InputArea {
         id: oskInputArea
 
-        readonly property int orientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
+        x: ubuntuKeyboardInfo.x
+        y: ubuntuKeyboardInfo.y
+        width: ubuntuKeyboardInfo.width
+        height: ubuntuKeyboardInfo.height
 
         surface: __oskSurface
         enabled: false
-
-        state: orientationAngle.toString()
-
-        states: [
-            State {
-                name: "0"
-                PropertyChanges { target: oskInputArea; height: ubuntuKeyboardInfo.height; width: undefined }
-                AnchorChanges { target: oskInputArea; anchors {
-                        top: undefined
-                        bottom: parent.bottom
-                        left: parent.left
-                        right: parent.right
-                }}
-            },
-            State {
-                name: "180"
-                PropertyChanges { target: oskInputArea; height: ubuntuKeyboardInfo.height; width: undefined }
-                AnchorChanges { target: oskInputArea; anchors {
-                        top: parent.top
-                        bottom: undefined
-                        left: parent.left
-                        right: parent.right
-                }}
-            },
-            State {
-                name: "270"
-                PropertyChanges { target: oskInputArea; height: undefined; width: ubuntuKeyboardInfo.height }
-                AnchorChanges { target: oskInputArea; anchors {
-                        top: parent.top
-                        bottom: parent.bottom
-                        left: undefined
-                        right: parent.right
-                }}
-            },
-            State {
-                name: "90"
-                PropertyChanges { target: oskInputArea; height: undefined; width: ubuntuKeyboardInfo.height }
-                AnchorChanges { target: oskInputArea; anchors {
-                        top: parent.top
-                        bottom: parent.bottom
-                        left: parent.left
-                        right: undefined
-                }}
-            }
-        ]
     }
 
     Connections {

=== modified file 'src/modules/Unity/Application/ubuntukeyboardinfo.cpp'
--- src/modules/Unity/Application/ubuntukeyboardinfo.cpp	2013-10-14 10:30:36 +0000
+++ src/modules/Unity/Application/ubuntukeyboardinfo.cpp	2013-10-14 18:42:48 +0000
@@ -117,6 +117,17 @@
 
     {
         struct SharedInfo *sharedInfo = reinterpret_cast<struct SharedInfo*>(bytes.data());
+
+        if (m_lastX != sharedInfo->keyboardX) {
+            m_lastX = sharedInfo->keyboardX;
+            Q_EMIT xChanged(m_lastX);
+        }
+
+        if (m_lastY != sharedInfo->keyboardY) {
+            m_lastY = sharedInfo->keyboardY;
+            Q_EMIT yChanged(m_lastY);
+        }
+
         if (m_lastWidth != sharedInfo->keyboardWidth) {
             m_lastWidth = sharedInfo->keyboardWidth;
             Q_EMIT widthChanged(m_lastWidth);

=== modified file 'src/modules/Unity/Application/ubuntukeyboardinfo.h'
--- src/modules/Unity/Application/ubuntukeyboardinfo.h	2013-10-11 15:34:58 +0000
+++ src/modules/Unity/Application/ubuntukeyboardinfo.h	2013-10-14 18:42:48 +0000
@@ -25,15 +25,21 @@
 // instead of a fullscreen one.
 class UbuntuKeyboardInfo : public QObject {
     Q_OBJECT
+    Q_PROPERTY(qreal x READ x NOTIFY xChanged)
+    Q_PROPERTY(qreal y READ y NOTIFY yChanged)
     Q_PROPERTY(qreal width READ width NOTIFY widthChanged)
     Q_PROPERTY(qreal height READ height NOTIFY heightChanged)
 public:
     UbuntuKeyboardInfo(QObject *parent = 0);
     virtual ~UbuntuKeyboardInfo();
+    qreal x() const { return m_lastX; }
+    qreal y() const { return m_lastY; }
     qreal width() const { return m_lastWidth; }
     qreal height() const { return m_lastHeight; }
 
 Q_SIGNALS:
+    void xChanged(qreal x);
+    void yChanged(qreal y);
     void widthChanged(qreal width);
     void heightChanged(qreal height);
 
@@ -47,6 +53,8 @@
     // NB! Must match the definition in ubuntu-keyboard. Not worth creating a shared header
     // just for that.
     struct SharedInfo {
+        qint32 keyboardX;
+        qint32 keyboardY;
         qint32 keyboardWidth;
         qint32 keyboardHeight;
     };
@@ -57,6 +65,8 @@
     int m_consecutiveAttempts;
 
     QLocalSocket m_socket;
+    qint32 m_lastX;
+    qint32 m_lastY;
     qint32 m_lastWidth;
     qint32 m_lastHeight;
     QTimer m_connectionRetryTimer;