Merge lp:~andreas-pokorny/ubuntu-keyboard/shellRotation-2 into lp:ubuntu-keyboard

[Andreas Pokorny]

rotation support for keyboard

updated shellRotation MP

Unmerged revisions

245. By Andreas Pokorny on 2015-02-28

merge lp:ubuntu_keyboard

=== modified file 'qml/Keyboard.qml'
--- qml/Keyboard.qml	2015-02-18 14:31:24 +0000
+++ qml/Keyboard.qml	2015-02-28 07:01:52 +0000
@@ -40,260 +40,233 @@
     id: fullScreenItem
     objectName: "fullScreenItem"
 
+    property bool landscape: width > height
+
     property variant input_method: maliit_input_method
     property variant event_handler: maliit_event_handler
 
-    onHeightChanged: calculateSize();
-
-    OrientationHelper {
-        id: orientationHelper
-        automaticOrientation: false
-        transitionEnabled: false
-
-        orientationAngle: Screen.angleBetween(Screen.primaryOrientation, canvas.contentOrientation);
-
-        onOrientationAngleChanged: {
-            calculateSize();
-        }
+    onXChanged: fullScreenItem.reportKeyboardVisibleRect();
+    onYChanged: fullScreenItem.reportKeyboardVisibleRect();
+    onWidthChanged: fullScreenItem.reportKeyboardVisibleRect();
+    onHeightChanged: fullScreenItem.reportKeyboardVisibleRect();
+
+    Item {
+        id: canvas
+        objectName: "ubuntuKeyboard" // Allow us to specify a specific keyboard within autopilot.
+
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+
+        width: parent.width
+        height: fullScreenItem.landscape ? (fullScreenItem.height * UI.phoneKeyboardHeightLandscape) + wordRibbon.height
+                                         : (fullScreenItem.height * UI.phoneKeyboardHeightPortrait) + wordRibbon.height
+
+        property int keypadHeight: height;
+
+        visible: true
+
+        property int contentOrientation: maliit_geometry.orientation
+        onContentOrientationChanged: fullScreenItem.reportKeyboardVisibleRect();
+
+        property bool wordribbon_visible: maliit_word_engine.enabled
+        onWordribbon_visibleChanged: fullScreenItem.reportKeyboardVisibleRect();
+
+        property bool languageMenuShown: false
+        property bool extendedKeysShown: false
+
+        property bool firstShow: true
+        property bool hidingComplete: true
+
+        property string layoutId: "freetext"
+
         onXChanged: fullScreenItem.reportKeyboardVisibleRect();
         onYChanged: fullScreenItem.reportKeyboardVisibleRect();
         onWidthChanged: fullScreenItem.reportKeyboardVisibleRect();
         onHeightChanged: fullScreenItem.reportKeyboardVisibleRect();
 
-        Item {
-            id: canvas
-            objectName: "ubuntuKeyboard" // Allow us to specify a specific keyboard within autopilot.
-
-            anchors.bottom: parent.bottom
+        MouseArea {
+            id: swipeArea
+
+            property int jumpBackThreshold: units.gu(10)
+
             anchors.left: parent.left
-
-            width: parent.width
-            height: 0
-
-            property int keypadHeight: height;
-
-            onRotationChanged: console.log("now rotation has changed!!" + rotation)
-
-            visible: true
-
-            property int contentOrientation: maliit_geometry.orientation
-            onContentOrientationChanged: fullScreenItem.reportKeyboardVisibleRect();
-
-            property bool wordribbon_visible: maliit_word_engine.enabled
-            onWordribbon_visibleChanged: calculateSize();
-
-            property bool languageMenuShown: false
-            property bool extendedKeysShown: false
-
-            property bool firstShow: true
-            property bool hidingComplete: true
-
-            property string layoutId: "freetext"
-
-            onXChanged: fullScreenItem.reportKeyboardVisibleRect();
-            onYChanged: fullScreenItem.reportKeyboardVisibleRect();
-            onWidthChanged: fullScreenItem.reportKeyboardVisibleRect();
-            onHeightChanged: fullScreenItem.reportKeyboardVisibleRect();
-
-            MouseArea {
-                id: swipeArea
-
-                property int jumpBackThreshold: units.gu(10)
-
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.top: parent.top
-                height: (parent.height - canvas.keypadHeight) + wordRibbon.height +
-                borderTop.height + units.gu(UI.top_margin)
-
-                drag.target: keyboardSurface
-                drag.axis: Drag.YAxis;
-                drag.minimumY: 0
-                drag.maximumY: parent.height
-                //fix for lp:1277186
-                //only filter children when wordRibbon visible
-                drag.filterChildren: wordRibbon.visible
-                // Avoid conflict with extended key swipe selection
-                enabled: !canvas.extendedKeysShown
-
-                onReleased: {
-                    if (keyboardSurface.y > jumpBackThreshold) {
-                        maliit_geometry.shown = false;
-                    } else {
-                        bounceBackAnimation.from = keyboardSurface.y
-                        bounceBackAnimation.start();
-                    }
+            anchors.right: parent.right
+            anchors.top: parent.top
+            height: (parent.height - canvas.keypadHeight) + wordRibbon.height +
+            borderTop.height + units.gu(UI.top_margin)
+
+            drag.target: keyboardSurface
+            drag.axis: Drag.YAxis;
+            drag.minimumY: 0
+            drag.maximumY: parent.height
+            //fix for lp:1277186
+            //only filter children when wordRibbon visible
+            drag.filterChildren: wordRibbon.visible
+            // Avoid conflict with extended key swipe selection
+            enabled: !canvas.extendedKeysShown
+
+            onReleased: {
+                if (keyboardSurface.y > jumpBackThreshold) {
+                    maliit_geometry.shown = false;
+                } else {
+                    bounceBackAnimation.from = keyboardSurface.y
+                    bounceBackAnimation.start();
+                }
+            }
+
+            Item {
+                id: keyboardSurface
+                objectName: "keyboardSurface"
+
+                x:0
+                y:0
+                width: parent.width
+                height: canvas.height
+
+                onXChanged: fullScreenItem.reportKeyboardVisibleRect();
+                onYChanged: fullScreenItem.reportKeyboardVisibleRect();
+                onWidthChanged: fullScreenItem.reportKeyboardVisibleRect();
+                onHeightChanged: fullScreenItem.reportKeyboardVisibleRect();
+
+                WordRibbon {
+                    id: wordRibbon
+                    objectName: "wordRibbon"
+
+                    visible: canvas.wordribbon_visible
+
+                    anchors.bottom: keyboardComp.top
+                    width: parent.width;
+
+                    height: canvas.wordribbon_visible ? units.gu(UI.wordribbonHeight) : 0
+                    onHeightChanged: fullScreenItem.reportKeyboardVisibleRect();
                 }
 
                 Item {
-                    id: keyboardSurface
-                    objectName: "keyboardSurface"
+                    id: keyboardComp
+                    objectName: "keyboardComp"
 
-                    x:0
-                    y:0
+                    height: canvas.keypadHeight - wordRibbon.height
                     width: parent.width
-                    height: canvas.height
+                    anchors.bottom: parent.bottom
 
-                    onXChanged: fullScreenItem.reportKeyboardVisibleRect();
-                    onYChanged: fullScreenItem.reportKeyboardVisibleRect();
-                    onWidthChanged: fullScreenItem.reportKeyboardVisibleRect();
                     onHeightChanged: fullScreenItem.reportKeyboardVisibleRect();
 
-                    WordRibbon {
-                        id: wordRibbon
-                        objectName: "wordRibbon"
-
-                        visible: canvas.wordribbon_visible
-
-                        anchors.bottom: keyboardComp.top
-                        width: parent.width;
-
-                        height: canvas.wordribbon_visible ? units.gu(UI.wordribbonHeight) : 0
-                        onHeightChanged: calculateSize();
-                    }
-
-                    Item {
-                        id: keyboardComp
-                        objectName: "keyboardComp"
-
-                        height: canvas.keypadHeight - wordRibbon.height
-                        width: parent.width
-                        anchors.bottom: parent.bottom
-
-                        onHeightChanged: fullScreenItem.reportKeyboardVisibleRect();
-
-                        Rectangle {
-                            id: background
-
-                            anchors.fill: parent
-
-                            color: UI.backgroundColor
-                        }
-
-                        Image {
-                            id: borderTop
-                            source: "styles/ubuntu/images/border_top.png"
-                            width: parent.width
-                            anchors.top: parent.top.bottom
-                        }
-
-                        KeyboardContainer {
-                            id: keypad
-
-                            anchors.top: borderTop.bottom
-                            anchors.bottom: background.bottom
-                            anchors.topMargin: units.gu( UI.top_margin )
-                            anchors.bottomMargin: units.gu( UI.bottom_margin )
-                            width: parent.width
-
-                            onPopoverEnabledChanged: fullScreenItem.reportKeyboardVisibleRect();
-                        }
-
-                        LanguageMenu {
-                            id: languageMenu
-                            objectName: "languageMenu"
-                            anchors.centerIn: parent
-                            height: contentHeight > keypad.height ? keypad.height : contentHeight
-                            width: units.gu(30);
-                            enabled: canvas.languageMenuShown
-                            visible: canvas.languageMenuShown
-                        }
-                    } // keyboardComp
-                }
-            }
-
-            PropertyAnimation {
-                id: bounceBackAnimation
-                target: keyboardSurface
-                properties: "y"
-                easing.type: Easing.OutBounce;
-                easing.overshoot: 2.0
-                to: 0
-            }
-
-            state: "HIDDEN"
-
-            states: [
-                State {
-                    name: "SHOWN"
-                    PropertyChanges { target: keyboardSurface; y: 0; }
-                    onCompleted: {
-                        canvas.firstShow = false;
-                        canvas.hidingComplete = false;
-                    }
-                    when: maliit_geometry.shown === true
-                },
-
-                State {
-                    name: "HIDDEN"
-                    PropertyChanges { target: keyboardSurface; y: canvas.height }
-                    onCompleted: {
-                        canvas.languageMenuShown = false;
-                        keypad.closeExtendedKeys();
-                        keypad.activeKeypadState = "NORMAL";
-                        keypad.state = "CHARACTERS";
-                        maliit_input_method.close();
-                        canvas.hidingComplete = true;
-                        reportKeyboardVisibleRect();
-                    }
-                    // Wait for the first show operation to complete before
-                    // allowing hiding, as the conditions when the keyboard
-                    // has never been visible can trigger a hide operation
-                    when: maliit_geometry.shown === false && canvas.firstShow === false
-                }
-            ]
-            transitions: Transition {
-                UbuntuNumberAnimation { target: keyboardSurface; properties: "y"; }
-            }
-
-            Connections {
-                target: input_method
-                onActivateAutocaps: {
-                    if (keypad.state == "CHARACTERS") {
-                        keypad.activeKeypadState = "SHIFTED";
-                        keypad.autoCapsTriggered = true;
-                    } else {
-                        keypad.delayedAutoCaps = true;
-                    }
-                }
-
-                onActiveLanguageChanged: {
-                    keypad.justChangedLanguage = true
-                }
-                onKeyboardReset: {
-                    keypad.state = "CHARACTERS"
-                    if (keypad.switchBack && maliit_input_method.previousLanguage && !keypad.justChangedLanguage) {
-                        keypad.switchBack = false;
-                        maliit_input_method.activeLanguage = maliit_input_method.previousLanguage;
-                    }
-                    keypad.justChangedLanguage = false;
-                }
-                onDeactivateAutocaps: {
-                    if(keypad.autoCapsTriggered) {
-                        keypad.activeKeypadState = "NORMAL";
-                        keypad.autoCapsTriggered = false;
-                    }
-                    keypad.delayedAutoCaps = false;
-                }
-            }
-
-        } // canvas
-    } // OrientationHelper
-
-    function calculateSize() {
-        // TODO tablet
-        if (orientationHelper.orientationAngle == 270 ||
-            orientationHelper.orientationAngle == 90) {
-            canvas.height = (fullScreenItem.width * UI.phoneKeyboardHeightLandscape) + wordRibbon.height
-        } else if (orientationHelper.orientationAngle == 0 ||
-                   orientationHelper.orientationAngle == 180) {
-            canvas.height = (fullScreenItem.height * UI.phoneKeyboardHeightPortrait) + wordRibbon.height
-        } else { // fallback
-            canvas.height = (fullScreenItem.height * UI.phoneKeyboardHeightPortrait) + wordRibbon.height
-        }
-
-        reportKeyboardVisibleRect();
-    }
+                    Rectangle {
+                        id: background
+
+                        anchors.fill: parent
+
+                        color: UI.backgroundColor
+                    }
+
+                    Image {
+                        id: borderTop
+                        source: "styles/ubuntu/images/border_top.png"
+                        width: parent.width
+                        anchors.top: parent.top.bottom
+                    }
+
+                    KeyboardContainer {
+                        id: keypad
+
+                        anchors.top: borderTop.bottom
+                        anchors.bottom: background.bottom
+                        anchors.topMargin: units.gu( UI.top_margin )
+                        anchors.bottomMargin: units.gu( UI.bottom_margin )
+                        width: parent.width
+
+                        onPopoverEnabledChanged: fullScreenItem.reportKeyboardVisibleRect();
+                    }
+
+                    LanguageMenu {
+                        id: languageMenu
+                        objectName: "languageMenu"
+                        anchors.centerIn: parent
+                        height: contentHeight > keypad.height ? keypad.height : contentHeight
+                        width: units.gu(30);
+                        enabled: canvas.languageMenuShown
+                        visible: canvas.languageMenuShown
+                    }
+                } // keyboardComp
+            }
+        }
+
+        PropertyAnimation {
+            id: bounceBackAnimation
+            target: keyboardSurface
+            properties: "y"
+            easing.type: Easing.OutBounce;
+            easing.overshoot: 2.0
+            to: 0
+        }
+
+        state: "HIDDEN"
+
+        states: [
+            State {
+                name: "SHOWN"
+                PropertyChanges { target: keyboardSurface; y: 0; }
+                onCompleted: {
+                    canvas.firstShow = false;
+                    canvas.hidingComplete = false;
+                }
+                when: maliit_geometry.shown === true
+            },
+
+            State {
+                name: "HIDDEN"
+                PropertyChanges { target: keyboardSurface; y: canvas.height }
+                onCompleted: {
+                    canvas.languageMenuShown = false;
+                    keypad.closeExtendedKeys();
+                    keypad.activeKeypadState = "NORMAL";
+                    keypad.state = "CHARACTERS";
+                    maliit_input_method.close();
+                    canvas.hidingComplete = true;
+                    reportKeyboardVisibleRect();
+                }
+                // Wait for the first show operation to complete before
+                // allowing hiding, as the conditions when the keyboard
+                // has never been visible can trigger a hide operation
+                when: maliit_geometry.shown === false && canvas.firstShow === false
+            }
+        ]
+        transitions: Transition {
+            UbuntuNumberAnimation { target: keyboardSurface; properties: "y"; }
+        }
+
+        Connections {
+            target: input_method
+            onActivateAutocaps: {
+                if (keypad.state == "CHARACTERS") {
+                    keypad.activeKeypadState = "SHIFTED";
+                    keypad.autoCapsTriggered = true;
+                } else {
+                    keypad.delayedAutoCaps = true;
+                }
+            }
+
+            onActiveLanguageChanged: {
+                keypad.justChangedLanguage = true
+            }
+            onKeyboardReset: {
+                keypad.state = "CHARACTERS"
+                if (keypad.switchBack && maliit_input_method.previousLanguage && !keypad.justChangedLanguage) {
+                    keypad.switchBack = false;
+                    maliit_input_method.activeLanguage = maliit_input_method.previousLanguage;
+                }
+                keypad.justChangedLanguage = false;
+            }
+            onDeactivateAutocaps: {
+                if(keypad.autoCapsTriggered) {
+                    keypad.activeKeypadState = "NORMAL";
+                    keypad.autoCapsTriggered = false;
+                }
+                keypad.delayedAutoCaps = false;
+            }
+        }
+
+    } // canvas
 
     function reportKeyboardVisibleRect() {
 

=== modified file 'qml/keys/ActionKey.qml'
--- qml/keys/ActionKey.qml	2014-09-16 12:39:01 +0000
+++ qml/keys/ActionKey.qml	2015-02-28 07:01:52 +0000
@@ -55,7 +55,7 @@
             name: actionKeyRoot.iconNormal
             color: actionKeyRoot.colorNormal
             anchors.centerIn: parent
-            anchors.verticalCenterOffset: orientationHelper.orientationAngle == 0 || orientationHelper.orientationAngle == 180 ? -units.gu(UI.row_margin/2) - units.gu(0.15) : -units.dp( UI.keyMargins )
+            anchors.verticalCenterOffset: fullScreenItem.landscape ? -units.dp( UI.keyMargins ) : -units.gu(UI.row_margin/2) - units.gu(0.15)
 
             visible: (label == "")
             width: units.gu(2.5)

=== modified file 'qml/keys/CharKey.qml'
--- qml/keys/CharKey.qml	2015-02-13 20:14:07 +0000
+++ qml/keys/CharKey.qml	2015-02-28 07:01:52 +0000
@@ -119,7 +119,7 @@
             anchors.fill: parent
             anchors.leftMargin: key.leftSide ? (parent.width - panel.keyWidth) + units.dp(UI.keyMargins) :  units.dp(UI.keyMargins)
             anchors.rightMargin: key.rightSide ? (parent.width - panel.keyWidth) + units.dp(UI.keyMargins) :  units.dp(UI.keyMargins)
-            anchors.bottomMargin: orientationHelper.orientationAngle == 0 || orientationHelper.orientationAngle == 180 ? units.gu(UI.row_margin) : units.dp( UI.keyMargins ) * 2;
+            anchors.bottomMargin: fullScreenItem.landscape ? units.dp( UI.keyMargins ) * 2 : units.gu(UI.row_margin);
             source: key.imgNormal
 
             BorderImage {

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2015-02-09 21:14:15 +0000
+++ src/plugin/inputmethod.cpp	2015-02-28 07:01:52 +0000
@@ -599,10 +599,7 @@
 {
     Q_D(InputMethod);
 
-    QRect visibleRect = qGuiApp->primaryScreen()->mapBetween(
-                            d->m_geometry->orientation(),
-                            qGuiApp->primaryScreen()->primaryOrientation(),
-                            d->m_geometry->visibleRect().toRect());
+    QRect visibleRect = d->m_geometry->visibleRect().toRect();
 
     inputMethodHost()->setScreenRegion(QRegion(visibleRect));
     inputMethodHost()->setInputMethodArea(visibleRect, d->view);