Merge lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-fix-mir-rotation into lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-qml-port

[Thomas Moenicke]

ubuntu-keyboard fullscreen

ubuntu-keyboard fullscreen

[lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-fix-mir-rotation]

48. By Thomas Moenicke on 2013-09-06

fixed wordribbon on/off for fullscreen osk

49. By Thomas Moenicke on 2013-09-09

merged with master branch

[Bill Filler (bfiller)]

review: Disapprove

Unmerged revisions

49. By Thomas Moenicke on 2013-09-09

merged with master branch

48. By Thomas Moenicke on 2013-09-06

fixed wordribbon on/off for fullscreen osk

47. By Thomas Moenicke on 2013-09-06

changing ubuntu-keyboard to fullscreen. Input trap is still calculated.
Using OrientationHelper.

=== modified file 'buildOnDevice.sh'
--- buildOnDevice.sh	2013-09-04 13:45:11 +0000
+++ buildOnDevice.sh	2013-09-09 08:52:28 +0000
@@ -88,7 +88,7 @@
     adb shell pkill "webbrowser-app"
     adb shell pkill "qmlscene"
 
-    exec_with_ssh "$BINARY $RUN_OPTIONS"
+#    exec_with_ssh "$BINARY $RUN_OPTIONS"
 }
 
 set -- `getopt -n$0 -u -a --longoptions="setup,help" "sh" "$@"`

=== modified file 'qml/Keyboard.qml'
--- qml/Keyboard.qml	2013-09-07 08:23:38 +0000
+++ qml/Keyboard.qml	2013-09-09 08:52:28 +0000
@@ -33,12 +33,32 @@
 import "constants.js" as Const
 
 import "keys/key_constants.js" as UI
+import Ubuntu.Components 0.1
+import QtQuick.Window 2.0
+
+Item {
+    objectName: "fullScreenItem"
+
+    property variant layout: maliit_layout
+    property variant event_handler: maliit_event_handler
+
+OrientationHelper {
+
+    automaticOrientation: false
+    transitionEnabled: false
+
+    orientationAngle: Screen.angleBetween(Screen.primaryOrientation, canvas.contentOrientation);
 
 Item {
     id: canvas
     objectName: "ubuntuKeyboard" // Allow us to specify a specific keyboard within autopilot.
-    property variant layout: maliit_layout
-    property variant event_handler: maliit_event_handler
+
+    anchors.bottom: parent.bottom
+    anchors.left: parent.left
+
+    width: parent.width
+
+    property int keypadHeight: 0 // set by InputMethod
 
     property string layoutId: "en_us"
     onLayoutIdChanged: keypad.loadLayout(layoutId);
@@ -49,16 +69,14 @@
     //readonly property var layoutState: layout.keyboard_state
     //readonly property string activeView: layout.activeView
 
-    property int contentOrientation: Qt.PrimaryOrientation
+    property int contentOrientation: Qt.PrimaryOrientation // overwritten by inputMethod
 
     property bool shown: false;
-    property bool wordribbon_visible: true;
-
+    property bool wordribbon_visible: false;
     property bool hideAnimationFinished: false;
     property int pressedKeyIndex: -1;
     property Item pressedKey;
 
-    RotationHelper {
 
         MouseArea {
             id: keyboardSurface
@@ -80,20 +98,20 @@
                 id: wordRibbon
                 objectName: "wordRibbon"
 
+                visible: canvas.wordribbon_visible
+
                 anchors.bottom: keyboardComp.top
                 width: parent.width;
 
-                height: wordribbon_visible ? layout.wordribbon_height : 0
+                height: visible ? layout.wordribbon_height : 0
             }
 
             Item {
                 id: keyboardComp
 
-                anchors {
-                    top: wordRibbon.bottom
-                    fill: parent
-                    topMargin: layout.invisible_toucharea_height + (wordribbon_visible ? layout.wordribbon_height : 0);
-                }
+                height: canvas.keypadHeight - wordRibbon.height
+                width: parent.width
+                anchors.bottom: parent.bottom
 
                 Rectangle {
                     id: background
@@ -158,7 +176,6 @@
             }
 
         } // big mousearea
-    } // rotation helper
 
     state: "HIDDEN"
 
@@ -183,5 +200,7 @@
     transitions: Transition {
         PropertyAnimation { target: canvas; properties: "y"; easing.type: Easing.InOutQuad }
     }
-}
 
+} // canvas
+} // OrientationHelper
+} // fullScreenItem

=== removed file 'qml/RotationHelper.qml'
--- qml/RotationHelper.qml	2013-08-09 15:22:29 +0000
+++ qml/RotationHelper.qml	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import QtQuick.Window 2.0
-
-Item {
-    id: rotationHelper
-
-    property string __rotationString: Screen.angleBetween(Screen.primaryOrientation, contentOrientation).toString();
-
-    rotation: Screen.angleBetween(Screen.primaryOrientation, contentOrientation);
-
-    anchors.fill: parent
-
-    Item {
-        state: __rotationString
-
-        states: [
-            State {
-                name: "270"
-                PropertyChanges {
-                    target: rotationHelper
-                    anchors {
-                        leftMargin: (parent.width - parent.height) / 2
-                        rightMargin: anchors.leftMargin
-                        topMargin: -anchors.leftMargin
-                        bottomMargin: anchors.topMargin
-                    }
-                }
-            },
-            State {
-                name: "90"
-                PropertyChanges {
-                    target: rotationHelper
-                    anchors {
-                        leftMargin: (parent.width - parent.height) / 2
-                        rightMargin: anchors.leftMargin
-                        topMargin: -anchors.leftMargin
-                        bottomMargin: anchors.topMargin
-                    }
-                }
-            }
-        ]
-   }
-}

=== modified file 'qml/qml.pro'
--- qml/qml.pro	2013-09-07 07:55:28 +0000
+++ qml/qml.pro	2013-09-09 08:52:28 +0000
@@ -24,7 +24,6 @@
     maliit-magnifier.qml \
     Keyboard.qml \
     maliit-ui-constants.qml \
-    RotationHelper.qml \
     WordRibbon.qml \
     Popper.qml \
     KeyboardContainer.qml \

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2013-09-03 11:14:53 +0000
+++ src/plugin/inputmethod.cpp	2013-09-09 08:52:28 +0000
@@ -85,6 +85,7 @@
     Q_D(InputMethod);
 
     d->view->setSource(QUrl::fromLocalFile(g_maliit_keyboard_qml));
+    d->view->setGeometry(qGuiApp->primaryScreen()->geometry());
 
     // FIXME: Reconnect feedback instance.
     Setup::connectAll(&d->layout.event_handler, &d->layout.updater, &d->editor);
@@ -451,7 +452,7 @@
     switch (status) {
     case QQuickView::Ready:
     {
-        d->qmlRootItem = qobject_cast<QQuickItem*> (d->view->rootObject());
+        d->qmlRootItem = d->view->rootObject()->findChild<QQuickItem*>("ubuntuKeyboard");
         QObject::connect(d->qmlRootItem, SIGNAL(hideAnimationFinishedChanged()), this, SLOT(onHideAnimationFinished()));
     }
         break;

=== modified file 'src/plugin/inputmethod_p.h'
--- src/plugin/inputmethod_p.h	2013-09-03 11:14:53 +0000
+++ src/plugin/inputmethod_p.h	2013-09-09 08:52:28 +0000
@@ -195,15 +195,16 @@
 
         keyboardVisibleRect = windowGeometryRect.adjusted(0,uiConst->invisibleTouchAreaHeight(orientation),0,0);
 
+        qmlRootItem->setProperty("height", windowGeometryRect.height());
+        qmlRootItem->setProperty("keypadHeight", keyboardVisibleRect.height());
+        qmlRootItem->setProperty("contentOrientation", screenOrientation);
+
         // qpa does not rotate the coordinate system
         windowGeometryRect = qGuiApp->primaryScreen()->mapBetween(
                         screenOrientation,
                         qGuiApp->primaryScreen()->primaryOrientation(),
                         windowGeometryRect);
 
-
-        view->setGeometry(windowGeometryRect);
-
         if (qmlRootItem->property("shown").toBool()) {
             host->setScreenRegion(QRegion(keyboardVisibleRect));
 
@@ -212,8 +213,6 @@
             host->setInputMethodArea(rect, view);
         }
 
-        qmlRootItem->setProperty("contentOrientation", screenOrientation);
-
         if (qmlRootItem->property("shown").toBool()) {
             applicationApiWrapper->reportOSKInvisible();