Merge lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-cleanup into lp:ubuntu-keyboard

[Thomas Moenicke]

cleanup

cleanup
moving size related stuff to qml

[lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-cleanup]

103. By Thomas Moenicke on 2013-11-13

removing dynamiclayout code

104. By Thomas Moenicke on 2013-11-13

fix inverted-landscape and inverted-portrait

105. By Thomas Moenicke on 2013-11-13

rebase

106. By Thomas Moenicke on 2013-11-13

fixing coding style

107. By Thomas Moenicke on 2013-11-13

removed unused maliit-ui-constants.qml

108. By Thomas Moenicke on 2013-11-13

removed file that accidently ended up in this MR

109. By Thomas Moenicke on 2013-11-15

considering wordribbon size for canvas size

110. By Thomas Moenicke on 2013-11-15

rebase

111. By Thomas Moenicke on 2013-11-15

ouch

112. By Thomas Moenicke on 2013-11-15

resize canvas when wordribbon changes (causes issue of osk being squeezed when going from browser to msg app with wordribbon enabled)

[Günter Schwann (schwann)]

works well

review: Approve

=== modified file 'buildOnDevice.sh'
--- buildOnDevice.sh	2013-11-15 09:32:12 +0000
+++ buildOnDevice.sh	2013-11-15 12:46:02 +0000
@@ -51,7 +51,7 @@
     sleep 2
     exec_with_ssh $SUDO apt-get -y install build-essential rsync bzr ccache gdb libglib2.0-bin unzip
 #    exec_with_ssh $SUDO add-apt-repository -s -y ppa:phablet-team/ppa
-#    exec_with_ssh $SUDO apt-get update
+    exec_with_ssh $SUDO apt-get update
     exec_with_ssh $SUDO apt-get -y build-dep $PACKAGE
 }
 

=== modified file 'qml/Keyboard.qml'
--- qml/Keyboard.qml	2013-11-08 08:19:50 +0000
+++ qml/Keyboard.qml	2013-11-15 12:46:02 +0000
@@ -44,13 +44,18 @@
     property variant layout: maliit_layout
     property variant event_handler: maliit_event_handler
 
+    onHeightChanged: calculateSize();
+
 OrientationHelper {
+    id: orientationHelper
     automaticOrientation: false
     transitionEnabled: false
 
     orientationAngle: Screen.angleBetween(Screen.primaryOrientation, canvas.contentOrientation);
 
-    onOrientationAngleChanged: fullScreenItem.reportKeyboardVisibleRect();
+    onOrientationAngleChanged: {
+        calculateSize();
+    }
     onXChanged: fullScreenItem.reportKeyboardVisibleRect();
     onYChanged: fullScreenItem.reportKeyboardVisibleRect();
     onWidthChanged: fullScreenItem.reportKeyboardVisibleRect();
@@ -64,9 +69,11 @@
     anchors.left: parent.left
 
     width: parent.width
-    height: maliit_geometry.canvasHeight
-
-    property int keypadHeight: maliit_geometry.keypadHeight
+    height: 0
+
+    property int keypadHeight: height;
+
+    onRotationChanged: console.log("now rotation has changed!!" + rotation)
 
     visible: true
 
@@ -78,6 +85,7 @@
     onContentOrientationChanged: fullScreenItem.reportKeyboardVisibleRect();
 
     property bool wordribbon_visible: maliit_input_method.showWordRibbon
+    onWordribbon_visibleChanged: calculateSize();
 
     property bool languageMenuShown: false
 
@@ -135,8 +143,8 @@
                 anchors.bottom: keyboardComp.top
                 width: parent.width;
 
-                height: visible ? layout.wordribbon_height : 0
-                onHeightChanged: fullScreenItem.reportKeyboardVisibleRect();
+                height: canvas.wordribbon_visible ? UI.wordribbonHeight : 0
+                onHeightChanged: calculateSize();
             }
 
             Item {
@@ -245,9 +253,29 @@
 } // 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();
+}
+
 // calculates the size of the visible keyboard to report to the window system
 // FIXME get the correct size for enabled extended keys instead of that big area
 function reportKeyboardVisibleRect() {
+
     var vx = 0;
     var vy = wordRibbon.y;
     var vwidth = keyboardSurface.width;

=== modified file 'qml/keys/key_constants.js'
--- qml/keys/key_constants.js	2013-10-25 13:16:15 +0000
+++ qml/keys/key_constants.js	2013-11-15 12:46:02 +0000
@@ -57,3 +57,12 @@
 /* language menu */
 var languageMenuListViewPadding = 2.22; // gu
 var languageMenuCorner = 2.5; // gu
+
+
+var wordribbonHeight = 72;
+
+var phoneKeyboardHeightPortrait = 0.365;
+var phoneKeyboardHeightLandscape = 0.50;
+
+var tabletKeyboardHeightPortrait = 0.28;
+var tabletKeyboardHeightLandscape = 0.38;

=== removed file 'qml/maliit-ui-constants.qml'
--- qml/maliit-ui-constants.qml	2013-07-19 12:05:07 +0000
+++ qml/maliit-ui-constants.qml	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-
-/**
- * these items only hold variables
- */
-
-Item {
-     id: keyboard_constants
-
-     property real key_area_borders:                        units.gu(  1.222    );
-     property string font_color:                            "#666666"
-     property string font_family:                           "Ubuntu Medium"
-
-     property int  reference_width:                         units.gu( 40.0      );
-     property int  reference_height:                        units.gu( 26.0      );
-
-     property int  portrait_invisible_touch_area:           units.gu(  6.777    );
-     property int  portrait_keyboard_visible_height:        units.gu( 26.0      );
-     property real portrait_keyboard_screen_width_ratio:               1.0
-
-     property real portrait_top_margin:                     units.gu(  1.35     );
-     property real landscape_top_margin:                    units.gu(  4.35     );
-     property real portrait_bottom_margin:                  units.gu(  2.00     );
-     property real landscape_bottom_margin:                 units.gu(  2.00     );
-
-     property real key_height:                              units.gu(  4.888     );
-
-     property real key_width_small:                         units.gu(  3.166     );
-     property real key_width_medium:                        units.gu(  3.666     );
-     property real key_width_large:                         units.gu(  4.222     ); // shift
-     property real key_width_xlarge:                        units.gu(  6.0       ); // 123 key
-     property real key_width_xxlarge:                       units.gu(  17.0      ); // space
-     property real key_width_stretched:                     units.gu(  3.0       ); // ?
-
-     property real font_size:                               units.gu(  2.111     );
-     property real font_size_small:                         units.gu(  1.8       );
-
-     property int  landscape_invisible_touch_area:          units.gu(  6.777    );
-     property int  landscape_keyboard_visible_height:       units.gu( 33.4      );
-     property real landscape_keyboard_screen_width_ratio:              1.0
-
-     property real landscape_space_between_rows:            units.dp(  0.00     );
-     property real landscape_space_between_keys:            units.dp(  0.00     );
-     property real portrait_space_between_rows:             units.dp(  2.00     );
-     property real portrait_space_between_keys:             units.dp( 10.00     );
-
-     property string key_background_normal:                 "[e-mail]"
-     property string key_background_special:                "[e-mail]"
-     property string key_background_deadkey:                ""
-
-     property real phone_keyboard_height_portrait:  0.365;
-     property real phone_keyboard_height_landscape: 0.50;
-
-     property real tablet_keyboard_height_portrait:  0.28;
-     property real tablet_keyboard_height_landscape: 0.38;
-
-     property int landscape_wordribbon_height:              units.gu( 4.0 );
-     property int portrait_wordribbon_height:               units.gu( 4.0 );
-}
-

=== modified file 'qml/qml.pro'
--- qml/qml.pro	2013-11-13 16:31:52 +0000
+++ qml/qml.pro	2013-11-15 12:46:02 +0000
@@ -91,7 +91,6 @@
     maliit-keyboard.qml \
     maliit-keyboard-extended.qml \
     maliit-magnifier.qml \
-    maliit-ui-constants.qml \
     Keyboard.qml \
     KeyboardContainer.qml \
     Popper.qml \

=== removed file 'src/lib/logic/dynamiclayout.cpp'
--- src/lib/logic/dynamiclayout.cpp	2013-08-09 15:22:29 +0000
+++ src/lib/logic/dynamiclayout.cpp	1970-01-01 00:00:00 +0000
@@ -1,337 +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/>.
- */
-
-#include "dynamiclayout.h"
-#include "dynamiclayout_p.h"
-
-namespace MaliitKeyboard {
-namespace Logic {
-
-int calculateVerticalMargin(LayoutHelper::Orientation orientation, Keyboard& kb)
-{
-    Q_UNUSED(kb);
-
-    const int freeSpace = uiConst->keypadHeight(orientation)
-                            - (uiConst->keyHeight(orientation) * uiConst->numberOfRows())
-                            - uiConst->keypadTopMargin(orientation);
-
-    const int vMargin = (freeSpace / (uiConst->numberOfRows()-1)) / 2;
-
-    return vMargin;
-}
-
-/*
- * calculates margin per row
- **/
-
-QVector<int> DynamicLayout::calculateMargins(LayoutHelper::Orientation orientation,
-                              Keyboard& kb)
-{
-    const qreal keyboardWidth = windowWidth(orientation);
-
-    QVector<int> margins;
-    int spaceTakenByKeys = 0;
-    int numberOfKeysInRow = 0;
-    for (int index = 0; index < kb.keys.count(); ++index) {
-        const KeyDescription &desc(kb.key_descriptions.at(index));
-        int width = uiConst->keyWidth(orientation, desc.width);
-        spaceTakenByKeys += width;
-        numberOfKeysInRow++;
-
-        bool at_row_end((index + 1 == kb.keys.count())
-                        || (index + 1 < kb.keys.count()
-                            && kb.key_descriptions.at(index + 1).row > desc.row));
-
-        if (at_row_end) {
-            int marginThisRow = ( (keyboardWidth - spaceTakenByKeys) / (numberOfKeysInRow-1) ) / 2;
-            margins.append(marginThisRow);
-            spaceTakenByKeys = 0;
-        }
-    }
-
-    return margins;
-}
-
-void DynamicLayout::calculateNumberOfRows(Keyboard& kb)
-{
-    if(d->genericStorage->numberOfRows > 0)
-        return;
-
-    d->genericStorage->numberOfRows = 0;
-    for (int index = 0; index < kb.keys.count(); ++index) {
-        const KeyDescription &desc(kb.key_descriptions.at(index));
-        bool at_row_end((index + 1 == kb.keys.count())
-                        || (index + 1 < kb.keys.count()
-                            && kb.key_descriptions.at(index + 1).row > desc.row));
-
-        if (at_row_end)
-            d->genericStorage->numberOfRows++;
-    }
-}
-
-DynamicLayout::DynamicLayout(QObject* parent) : QObject(parent),
-    d(new DynamicLayoutPrivate(this))
-{
-    const QScreen* screen = qGuiApp->primaryScreen();
-    connect( screen, SIGNAL(primaryOrientationChanged(Qt::ScreenOrientation)), this, SLOT(onPrimaryOrientationChanged(Qt::ScreenOrientation)) );
-    connect( screen, SIGNAL(orientationChanged(Qt::ScreenOrientation)), this, SLOT(onPrimaryOrientationChanged(Qt::ScreenOrientation)) );
-    connect( screen, SIGNAL(geometryChanged(QRect)), this, SLOT(onGeometryChanged(QRect)) );
-
-    d->primaryOrientation = screen->primaryOrientation();
-    d->orientation = screen->orientation();
-    d->geometry = screen->geometry();
-}
-
-
-DynamicLayout* DynamicLayout::self = 0;
-
-void DynamicLayout::initDynamicLayout(QString fileName)
-{
-    d->initDynamicLayout(fileName);
-}
-
-int DynamicLayout::windowWidth(LayoutHelper::Orientation orientation)
-{
-    return d->storage(orientation)->windowGeometryRect.width();
-}
-
-QRect DynamicLayout::windowGeometryRect(Qt::ScreenOrientation orientation)
-{
-    if (orientation != d->cachedOrientation)
-        d->invalidateWindowGeometryCache();
-
-    if ( !d->windowGeometryCacheValid ) {
-        LayoutHelper::Orientation maliitOrientation = LayoutHelper::Landscape;
-
-        if (orientation == Qt::PortraitOrientation || orientation == Qt::InvertedPortraitOrientation)
-            maliitOrientation = LayoutHelper::Portrait;
-
-        if (orientation == Qt::InvertedLandscapeOrientation || orientation == Qt::InvertedPortraitOrientation) {
-            if (!d->wordRibbonEnabled) {
-                return d->writeCache( orientation, d->storage(maliitOrientation)->windowGeometryRectInverted
-                        .adjusted  (0, wordRibbonHeight(maliitOrientation), 0, 0)
-                        .translated(0,-wordRibbonHeight(maliitOrientation)) );
-            } else {
-                return d->writeCache( orientation, d->storage(maliitOrientation)->windowGeometryRectInverted );
-            }
-        }
-
-        if (!d->wordRibbonEnabled)
-            return d->writeCache( orientation, d->storage(maliitOrientation)->windowGeometryRect.adjusted(0, d->storage(maliitOrientation)->wordRibbonHeight, 0, 0) );
-
-        return d->writeCache( orientation, d->storage(maliitOrientation)->windowGeometryRect );
-    }
-
-    return d->windowGeometryRectCached;
-}
-
-qreal DynamicLayout::keyWidth(LayoutHelper::Orientation orientation, KeyDescription::Width requestedSize)
-{
-    qreal width = 1.0;
-
-    switch (requestedSize) {
-    case KeyDescription::Small:
-        width = d->genericStorage->keyWidthSmall;
-        break;
-    case KeyDescription::Medium:
-        width = d->genericStorage->keyWidthMedium;
-        break;
-    case KeyDescription::Large:
-        width = d->genericStorage->keyWidthLarge;
-        break;
-    case KeyDescription::XLarge:
-        width = d->genericStorage->keyWidthXLarge;
-        break;
-    case KeyDescription::XXLarge:
-        width = d->genericStorage->keyWidthXXLarge;
-        break;
-    case KeyDescription::Stretched:
-        width = d->genericStorage->keyWidthStretched;
-        break;
-    default: break;
-    }
-
-    width *= d->widthStretchFactor(orientation);
-
-    return width;
-}
-
-/**
- *  gaps are defined in dp or gu, while key height stretches
- */
-
-qreal DynamicLayout::keyHeight(LayoutHelper::Orientation orientation)
-{
-    const qreal numberOfgaps = d->genericStorage->numberOfRows - 1;
-
-    switch (orientation) {
-    case LayoutHelper::Landscape:
-    {
-        const qreal gapSize = d->landscapeStorage->spaceBetweenRows;
-        const qreal bottomMargin = d->landscapeStorage->keyboardBottomMargin;
-        const qreal topMargin = d->landscapeStorage->keypadTopMargin;
-        const qreal keyHeight = (d->landscapeStorage->keypadHeight
-                           - (numberOfgaps * gapSize)
-                           - bottomMargin
-                           - topMargin)
-                           / (qreal) d->genericStorage->numberOfRows;
-        return keyHeight;
-    }
-        break;
-    case LayoutHelper::Portrait:
-    {
-        const qreal gapSize = d->portraitStorage->spaceBetweenRows;
-        const qreal bottomMargin = d->portraitStorage->keyboardBottomMargin;
-        const qreal topMargin = d->portraitStorage->keypadTopMargin;
-        const qreal keyHeight = (d->portraitStorage->keypadHeight
-                           - (numberOfgaps * gapSize)
-                           - bottomMargin
-                           - topMargin)
-                           / (qreal) d->genericStorage->numberOfRows;
-        return keyHeight;
-    }
-        break;
-    default: return 1.0;
-    }
-}
-
-QByteArray DynamicLayout::keyBackground(Key::Style style, KeyDescription::State state) const
-{
-    Q_UNUSED(state);
-
-    switch (style) {
-    case Key::StyleNormalKey:
-        return d->genericStorage->keyBackgroundNormal;
-    case Key::StyleSpecialKey:
-        return d->genericStorage->keyBackgroundSpecial;
-    case Key::StyleDeadKey:
-        return d->genericStorage->keyBackgroundDead;
-    default: break;
-    }
-
-    return "";
-}
-
-Logic::LayoutHelper::Orientation DynamicLayout::screenToMaliitOrientation(Qt::ScreenOrientation screenOrientation) const
-{
-    switch (screenOrientation) {
-    case Qt::LandscapeOrientation:
-    case Qt::InvertedLandscapeOrientation:
-        return Logic::LayoutHelper::Landscape;
-        break;
-    case Qt::PortraitOrientation:
-    case Qt::InvertedPortraitOrientation:
-    case Qt::PrimaryOrientation:
-    default:
-        return Logic::LayoutHelper::Portrait;
-    }
-
-    return Logic::LayoutHelper::Portrait;
-}
-
-int DynamicLayout::keypadHeight(LayoutHelper::Orientation orientation)
-{
-    return d->storage(orientation)->keypadHeight;
-}
-
-qreal DynamicLayout::keyboardScreenWidthRatio(LayoutHelper::Orientation orientation)
-{
-    return d->storage(orientation)->keyboardScreenWidthRatio;
-}
-
-QMargins DynamicLayout::keyAreaBorders()
-{
-    return d->genericStorage->keyAreaBorders;
-}
-
-qreal DynamicLayout::fontSize(LayoutHelper::Orientation orientation)
-{
-    Q_UNUSED(orientation);
-    return d->genericStorage->fontSize;
-}
-qreal DynamicLayout::fontSizeSmall(LayoutHelper::Orientation orientation)
-{
-    Q_UNUSED(orientation);
-    return d->genericStorage->fontSizeSmall;
-}
-
-QByteArray DynamicLayout::fontColor()
-{
-    return d->genericStorage->fontColor;
-}
-
-QByteArray DynamicLayout::fontFamily()
-{
-    return d->genericStorage->fontFamily;
-}
-
-qreal DynamicLayout::keypadTopMargin(LayoutHelper::Orientation orientation)
-{
-    return d->storage(orientation)->keypadTopMargin;
-}
-
-qreal DynamicLayout::spaceBetweenRows(LayoutHelper::Orientation orientation)
-{
-    return d->storage(orientation)->spaceBetweenRows;
-}
-
-qreal DynamicLayout::spaceBetweenKeys(LayoutHelper::Orientation orientation)
-{
-    return d->storage(orientation)->spaceBetweenKeys;
-}
-
-int DynamicLayout::invisibleTouchAreaHeight(LayoutHelper::Orientation orientation)
-{
-    return d->storage(orientation)->invisibleTouchAreaHeight;
-}
-
-int DynamicLayout::numberOfRows() const
-{
-    return d->genericStorage->numberOfRows;
-}
-
-int DynamicLayout::wordRibbonHeight(LayoutHelper::Orientation orientation)
-{
-    return d->storage(orientation)->wordRibbonHeight;
-}
-
-void DynamicLayout::onWordEngineSettingsChanged(bool wordEngineEnabled)
-{
-    if (d->wordRibbonEnabled != wordEngineEnabled) {
-        d->wordRibbonEnabled = wordEngineEnabled;
-        d->invalidateWindowGeometryCache();
-    }
-}
-
-void DynamicLayout::onPrimaryOrientationChanged(Qt::ScreenOrientation orientation)
-{
-    d->primaryOrientation = orientation;
-}
-
-void DynamicLayout::onOrientationChanged(Qt::ScreenOrientation orientation)
-{
-    d->orientation = orientation;
-}
-
-void DynamicLayout::onGeometryChanged(const QRect & geometry)
-{
-    d->geometry = geometry;
-    d->invalidateWindowGeometryCache();
-}
-
-
-
-}} // namespaces

=== removed file 'src/lib/logic/dynamiclayout.h'
--- src/lib/logic/dynamiclayout.h	2013-08-09 16:09:07 +0000
+++ src/lib/logic/dynamiclayout.h	1970-01-01 00:00:00 +0000
@@ -1,110 +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/>.
- */
-
-#ifndef DYNAMICLAYOUT_H
-#define DYNAMICLAYOUT_H
-
-#include "logic/layouthelper.h"
-#include "models/keydescription.h"
-#include "models/keyboard.h"
-
-#include <QObject>
-
-#include <QtCore>
-#include <QtGui/QGuiApplication>
-#include <QtGui/QScreen>
-#include <QtQuick>
-
-namespace MaliitKeyboard {
-namespace Logic {
-
-#define uiConst ::MaliitKeyboard::Logic::DynamicLayout::instance()
-
-class DynamicLayoutPrivate;
-
-class DynamicLayout : public QObject
-{
-    Q_OBJECT
-
-public:
-    static DynamicLayout* instance()
-    {
-        if (!self) {
-            self = new DynamicLayout;
-        }
-        return self;
-    }
-
-    static void reset()
-    {
-        if (self)
-            self = new DynamicLayout;
-    }
-
-    void initDynamicLayout(QString fileName = UBUNTU_KEYBOARD_DATA_DIR "/maliit-ui-constants.qml");
-
-    int keypadHeight(LayoutHelper::Orientation orientation);
-    int windowWidth(LayoutHelper::Orientation orientation);
-    QRect windowGeometryRect(Qt::ScreenOrientation orientation);
-    qreal keyboardScreenWidthRatio(LayoutHelper::Orientation orientation);
-
-    qreal keyHeight(LayoutHelper::Orientation orientation);
-    qreal keyWidth(LayoutHelper::Orientation orientation, KeyDescription::Width width);
-
-    QMargins keyAreaBorders();
-
-    qreal fontSize(LayoutHelper::Orientation orientation);
-    qreal fontSizeSmall(LayoutHelper::Orientation orientation);
-    QByteArray fontColor();
-    QByteArray fontFamily();
-
-    qreal keypadTopMargin(LayoutHelper::Orientation orientation);
-
-    QByteArray keyBackground(Key::Style style, KeyDescription::State state) const;
-    Logic::LayoutHelper::Orientation screenToMaliitOrientation(Qt::ScreenOrientation screenOrientation) const;
-
-    qreal spaceBetweenRows(LayoutHelper::Orientation orientation);
-    qreal spaceBetweenKeys(LayoutHelper::Orientation orientation);
-
-    int invisibleTouchAreaHeight(LayoutHelper::Orientation orientation);
-
-    void calculateNumberOfRows(Keyboard& kb);
-    int numberOfRows() const;
-
-    int wordRibbonHeight(LayoutHelper::Orientation orientation);
-
-    QVector<int> calculateMargins(LayoutHelper::Orientation orientation, Keyboard& kb);
-
-    Q_SLOT void onWordEngineSettingsChanged(bool wordEngineEnabled);
-
-    /* interface to primaryScreen */
-    Q_SLOT void onPrimaryOrientationChanged(Qt::ScreenOrientation orientation);
-    Q_SLOT void onOrientationChanged(Qt::ScreenOrientation orientation);
-    Q_SLOT void onGeometryChanged(const QRect & geometry);
-
-private:
-    explicit DynamicLayout(QObject *parent = 0);
-    DynamicLayout(DynamicLayout const&) : QObject(0) {}
-    DynamicLayout& operator=(DynamicLayout const&){ return *this; }
-    static DynamicLayout* self;
-
-    DynamicLayoutPrivate* d;
-};
-
-#endif // DYNAMICLAYOUT_H
-
-}
-}

=== removed file 'src/lib/logic/dynamiclayout_p.h'
--- src/lib/logic/dynamiclayout_p.h	2013-08-09 15:22:29 +0000
+++ src/lib/logic/dynamiclayout_p.h	1970-01-01 00:00:00 +0000
@@ -1,325 +0,0 @@
-
-#include <QtCore>
-
-#include "layouthelper.h"
-
-namespace MaliitKeyboard {
-namespace Logic {
-
-class DynamicLayout;
-
-class DynamicLayoutPrivate {
-public:
-
-    struct DynamicLayoutStorage {
-        DynamicLayoutStorage()
-            : widthStretchFactor(1.0),
-              heightStretchFactor(1.0),
-              numberOfRows(0)
-        {
-        }
-
-        int keypadHeight;
-        int invisibleTouchAreaHeight;
-        int wordRibbonHeight;
-        int keyboardHeight; // everything visible incl wordribbon
-
-        QRect windowGeometryRect;
-        QRect windowGeometryRectInverted;
-
-        // includes wordribbon
-        QRect keyboardRect;
-
-        qreal keyboardScreenWidthRatio;
-        qreal keyHeight;
-        qreal keyWidthSmall;
-        qreal keyWidthMedium;
-        qreal keyWidthLarge;
-        qreal keyWidthXLarge;
-        qreal keyWidthXXLarge;
-        qreal keyWidthStretched;
-        QMargins keyAreaBorders;
-        qreal fontSize;
-        qreal fontSizeSmall;
-        QByteArray fontColor;
-        QByteArray fontFamily;
-        qreal widthStretchFactor;
-        qreal heightStretchFactor;
-        qreal keypadTopMargin;
-        qreal keyboardBottomMargin;
-
-        QByteArray keyBackgroundNormal;
-        QByteArray keyBackgroundSpecial;
-        QByteArray keyBackgroundDead;
-
-        int numberOfRows;
-        qreal spaceBetweenRows;
-        qreal spaceBetweenKeys;
-    };
-
-    DynamicLayoutStorage* storage(LayoutHelper::Orientation orientation)
-    {
-        q->initDynamicLayout();
-
-        if (orientation == LayoutHelper::Landscape)
-            return landscapeStorage;
-        else if (orientation == LayoutHelper::Portrait)
-            return portraitStorage;
-
-        return portraitStorage;
-    }
-
-    qreal widthStretchFactor(LayoutHelper::Orientation orientation)
-    {
-        switch (orientation) {
-        case LayoutHelper::Landscape:
-            return landscapeStorage->widthStretchFactor;
-            break;
-        case LayoutHelper::Portrait:
-            return portraitStorage->widthStretchFactor;
-            break;
-        default: return 1.0;
-        }
-    }
-
-    qreal heightStretchFactor(LayoutHelper::Orientation orientation)
-    {
-        switch (orientation) {
-        case LayoutHelper::Landscape:
-            return landscapeStorage->heightStretchFactor;
-            break;
-        case LayoutHelper::Portrait:
-            return portraitStorage->heightStretchFactor;
-            break;
-        default: return 1.0;
-        }
-    }
-
-    DynamicLayout* q;
-    bool initialized;
-    bool wordRibbonEnabled;
-
-    // short term-caching in memory
-    Qt::ScreenOrientation cachedOrientation;
-    bool windowGeometryCacheValid;
-    QRect windowGeometryRectCached;
-
-    LayoutHelper::Orientation marginsCachedOrientation;
-    bool marginsCacheValid;
-    QVector<int> marginsCached;
-
-    DynamicLayoutStorage* portraitStorage;
-    DynamicLayoutStorage* landscapeStorage;
-    DynamicLayoutStorage* genericStorage;
-
-    Qt::ScreenOrientation primaryOrientation;
-    Qt::ScreenOrientation orientation;
-    QRect geometry;
-
-    DynamicLayoutPrivate(DynamicLayout* _q) :
-        q(_q),
-        initialized(false),
-        wordRibbonEnabled(false),
-
-        cachedOrientation(Qt::PortraitOrientation),
-        windowGeometryCacheValid(false),
-        windowGeometryRectCached(QRect(0,0,0,0)),
-
-        marginsCachedOrientation(LayoutHelper::Portrait),
-        marginsCacheValid(false),
-        marginsCached(0),
-
-        portraitStorage(new DynamicLayoutStorage),
-        landscapeStorage(new DynamicLayoutStorage),
-        genericStorage(new DynamicLayoutStorage)
-    {
-    }
-
-    // ToDo this needs to be refactored
-    void initDynamicLayout(QString fileName)
-    {
-        q->instance();
-
-        if (!initialized) {
-            QQuickView quickView;
-            quickView.setSource(QUrl::fromLocalFile( fileName ));
-            QQuickItem* quickItem = quickView.rootObject();
-
-            const QRect rLandscape = qGuiApp->primaryScreen()->mapBetween(
-                        primaryOrientation,
-                        Qt::LandscapeOrientation,
-                        geometry);
-
-            const QRect rInvertedLandscape = qGuiApp->primaryScreen()->mapBetween(
-                        primaryOrientation,
-                        Qt::InvertedLandscapeOrientation,
-                        geometry);
-
-            const QRect rPortrait = qGuiApp->primaryScreen()->mapBetween(
-                        primaryOrientation,
-                        Qt::PortraitOrientation,
-                        geometry);
-
-            const QRect rInvertedPortrait = qGuiApp->primaryScreen()->mapBetween(
-                        primaryOrientation,
-                        Qt::InvertedPortraitOrientation,
-                        geometry);
-
-
-            // generic
-
-            genericStorage->keyAreaBorders = QMargins(quickItem->property("key_area_borders").toInt(),
-                                                      quickItem->property("key_area_borders").toInt(),
-                                                      quickItem->property("key_area_borders").toInt(),
-                                                      quickItem->property("key_area_borders").toInt()
-                                                      );
-
-            genericStorage->fontColor = quickItem->property("font_color").toByteArray();
-            genericStorage->fontFamily = quickItem->property("font_family").toByteArray();
-
-            landscapeStorage->wordRibbonHeight = quickItem->property("landscape_wordribbon_height").toInt();
-            portraitStorage->wordRibbonHeight = quickItem->property("portrait_wordribbon_height").toInt();
-
-            // portrait
-
-            qreal portraitHeightRatio = quickItem->property("phone_keyboard_height_portrait").toReal();
-            if (primaryOrientation == Qt::LandscapeOrientation)
-                portraitHeightRatio = quickItem->property("tablet_keyboard_height_portrait").toReal();
-
-            portraitStorage->invisibleTouchAreaHeight = quickItem->property("portrait_invisible_touch_area").toInt();
-
-            portraitStorage->keypadHeight = rPortrait.height() * portraitHeightRatio;
-            portraitStorage->keyboardHeight = portraitStorage->keypadHeight
-                    + portraitStorage->wordRibbonHeight;
-            portraitStorage->keyboardScreenWidthRatio = quickItem->property("portrait_keyboard_screen_width_ratio").toReal();
-
-            const int portraitKeyboardWidth = rPortrait.width() * portraitStorage->keyboardScreenWidthRatio;
-            const int xp = (rPortrait.width() - (portraitKeyboardWidth)) / 2;
-
-            // point of origin differs when primary orientation is different
-            int yp = 0;
-            if(primaryOrientation == Qt::PortraitOrientation)
-                yp = rPortrait.height() - (portraitStorage->keypadHeight
-                                           + portraitStorage->wordRibbonHeight
-                                           + portraitStorage->invisibleTouchAreaHeight);
-
-            portraitStorage->windowGeometryRect = QRect(xp, yp, portraitKeyboardWidth,
-                                                        portraitStorage->keypadHeight
-                                                        + portraitStorage->wordRibbonHeight
-                                                        + portraitStorage->invisibleTouchAreaHeight);
-
-            const int invertedPortraitKeyboardWidth = rInvertedPortrait.width() * portraitStorage->keyboardScreenWidthRatio;
-            const int xpi = (rInvertedPortrait.width() - (portraitKeyboardWidth)) / 2;
-
-            // point of origin differs when primary orientation is different
-            int ypi = 0;
-            if(primaryOrientation == Qt::LandscapeOrientation)
-                ypi = rInvertedPortrait.height() - (portraitStorage->keypadHeight
-                                                    + portraitStorage->wordRibbonHeight
-                                                    + portraitStorage->invisibleTouchAreaHeight);
-
-            portraitStorage->windowGeometryRectInverted = QRect(xpi, ypi, invertedPortraitKeyboardWidth,
-                                                                portraitStorage->keypadHeight
-                                                                + portraitStorage->wordRibbonHeight
-                                                                + portraitStorage->invisibleTouchAreaHeight);
-
-            portraitStorage->keypadTopMargin = quickItem->property("portrait_top_margin").toInt();
-            landscapeStorage->keypadTopMargin = 0.02 * rLandscape.height(); //DynamicLayoutHelper->property("landscape_top_margin").toInt();
-
-            portraitStorage->keyboardBottomMargin = quickItem->property("portrait_bottom_margin").toInt();
-            landscapeStorage->keyboardBottomMargin = 0.02 * rLandscape.height();//DynamicLayoutHelper->property("landscape_bottom_margin").toInt();
-
-            // landscape
-
-            qreal landscapeHeightRatio = quickItem->property("phone_keyboard_height_landscape").toReal();
-            if (primaryOrientation == Qt::LandscapeOrientation)
-                landscapeHeightRatio = quickItem->property("tablet_keyboard_height_landscape").toReal();
-
-            landscapeStorage->invisibleTouchAreaHeight = quickItem->property("landscape_invisible_touch_area").toInt();
-            landscapeStorage->keyboardHeight = landscapeStorage->keypadHeight
-                    + landscapeStorage->wordRibbonHeight;
-
-            landscapeStorage->keypadHeight = rLandscape.height() * landscapeHeightRatio;
-
-            landscapeStorage->keyboardScreenWidthRatio = quickItem->property("landscape_keyboard_screen_width_ratio").toReal();
-
-            const int landscapeKeyboardWidth = rLandscape.width() * landscapeStorage->keyboardScreenWidthRatio;
-            const int xl = (rLandscape.width() - (landscapeKeyboardWidth)) / 2;
-            const int yl = rLandscape.height() - (landscapeStorage->keypadHeight
-                                                  + landscapeStorage->wordRibbonHeight
-                                                  + landscapeStorage->invisibleTouchAreaHeight);
-
-            landscapeStorage->windowGeometryRect = QRect(xl, yl, landscapeKeyboardWidth,
-                                                         landscapeStorage->keypadHeight
-                                                         + landscapeStorage->wordRibbonHeight
-                                                         + landscapeStorage->invisibleTouchAreaHeight);
-
-            const int invertedLandscapeKeyboardWidth = rInvertedLandscape.width() * landscapeStorage->keyboardScreenWidthRatio;
-            const int xli = (rInvertedLandscape.width() - (invertedLandscapeKeyboardWidth)) / 2;
-            const int yli = 0;
-
-            landscapeStorage->windowGeometryRectInverted = QRect(xli, yli, invertedLandscapeKeyboardWidth,
-                                                                 landscapeStorage->keypadHeight
-                                                                 + landscapeStorage->wordRibbonHeight
-                                                                 + landscapeStorage->invisibleTouchAreaHeight);
-
-            // reference
-            const QSize referenceSize(
-                        quickItem->property("reference_width").toInt(),
-                        quickItem->property("reference_height").toInt());
-
-            landscapeStorage->widthStretchFactor = (qreal) landscapeStorage->windowGeometryRect.width() / referenceSize.width();
-            portraitStorage->widthStretchFactor = (qreal) portraitStorage->windowGeometryRect.width() / referenceSize.width();
-
-            genericStorage->keyHeight = quickItem->property("key_height").toReal();
-            genericStorage->keyWidthSmall = quickItem->property("key_width_small").toReal();
-            genericStorage->keyWidthMedium = quickItem->property("key_width_medium").toReal();
-            genericStorage->keyWidthLarge = quickItem->property("key_width_large").toReal();
-            genericStorage->keyWidthXLarge = quickItem->property("key_width_xlarge").toReal();
-            genericStorage->keyWidthXXLarge = quickItem->property("key_width_xxlarge").toReal();
-            genericStorage->keyWidthStretched = quickItem->property("key_width_stretched").toReal();
-
-            landscapeStorage->spaceBetweenRows = quickItem->property("landscape_space_between_rows").toReal();
-            landscapeStorage->spaceBetweenKeys = quickItem->property("landscape_space_between_keys").toReal();
-
-            portraitStorage->spaceBetweenRows = quickItem->property("portrait_space_between_rows").toReal();
-            portraitStorage->spaceBetweenKeys = quickItem->property("portrait_space_between_keys").toReal();
-
-            // S M L XL XXL Stretched
-
-            genericStorage->fontSize = quickItem->property("font_size").toReal();
-            genericStorage->fontSizeSmall = quickItem->property("font_size_small").toReal();
-
-            genericStorage->keyBackgroundNormal = quickItem->property("key_background_normal").toByteArray();
-            genericStorage->keyBackgroundSpecial = quickItem->property("key_background_special").toByteArray();
-            genericStorage->keyBackgroundDead = quickItem->property("key_background_deadkey").toByteArray();
-
-            initialized = true;
-
-            qDebug() << "landscape         " << rLandscape << landscapeStorage->windowGeometryRect;
-            qDebug() << "landscape inverted" << rInvertedLandscape << landscapeStorage->windowGeometryRectInverted;
-
-            qDebug() << "portrait          " << rPortrait << portraitStorage->windowGeometryRect;
-            qDebug() << "portrait inverted " << rInvertedPortrait << portraitStorage->windowGeometryRectInverted;
-        }
-    }
-
-    const QRect& writeCache( Qt::ScreenOrientation orientation, const QRect& cachedRect ) {
-        windowGeometryCacheValid = true;
-        cachedOrientation = orientation;
-        windowGeometryRectCached = cachedRect;
-        return windowGeometryRectCached;
-    }
-
-    void invalidateWindowGeometryCache() {
-        windowGeometryCacheValid = false;
-    }
-
-    void invalidateMarginsCache() {
-        marginsCacheValid = false;
-        marginsCached.clear();
-    }
-};
-
-}
-}

=== modified file 'src/lib/logic/logic.pri'
--- src/lib/logic/logic.pri	2013-11-08 08:19:50 +0000
+++ src/lib/logic/logic.pri	2013-11-15 12:46:02 +0000
@@ -11,7 +11,6 @@
     logic/abstractlanguagefeatures.h \
     logic/languagefeatures.h \
     logic/eventhandler.h \
-    logic/dynamiclayout.h \
     logic/pinyinadapter.h \
     logic/chineselanguagefeatures.h
 
@@ -26,7 +25,6 @@
     logic/abstractlanguagefeatures.cpp \
     logic/languagefeatures.cpp \
     logic/eventhandler.cpp \
-    logic/dynamiclayout.cpp \
     logic/pinyinadapter.cpp \
     logic/chineselanguagefeatures.cpp
 

=== modified file 'src/lib/models/layout.cpp'
--- src/lib/models/layout.cpp	2013-11-07 17:43:22 +0000
+++ src/lib/models/layout.cpp	2013-11-15 12:46:02 +0000
@@ -34,8 +34,6 @@
 #include "key.h"
 #include "keydescription.h"
 
-#include "logic/dynamiclayout.h"
-
 #include <QtGui/QGuiApplication>
 #include <QScreen>
 
@@ -196,13 +194,6 @@
     return d->key_area.rect().height();
 }
 
-int Layout::wordRibbonHeight() const
-{
-    return uiConst->wordRibbonHeight(
-                uiConst->screenToMaliitOrientation(
-                    qGuiApp->primaryScreen()->orientation()) );
-}
-
 QPoint Layout::origin() const
 {
     Q_D(const Layout);
@@ -225,13 +216,6 @@
     return QRectF(m.left(), m.top(), m.right(), m.bottom());
 }
 
-int Layout::invisibleTouchAreaHeight() const
-{
-    return uiConst->invisibleTouchAreaHeight(
-                uiConst->screenToMaliitOrientation(
-                    qGuiApp->primaryScreen()->orientation()) );
-}
-
 Layout::State Layout::state() const
 {
     Q_D(const Layout);

=== modified file 'src/lib/models/layout.h'
--- src/lib/models/layout.h	2013-08-13 03:11:49 +0000
+++ src/lib/models/layout.h	2013-11-15 12:46:02 +0000
@@ -67,16 +67,12 @@
                          NOTIFY widthChanged)
     Q_PROPERTY(int height READ height
                           NOTIFY heightChanged)
-    Q_PROPERTY(int wordribbon_height READ wordRibbonHeight
-                          NOTIFY wordRibbonHeightChanged)
     Q_PROPERTY(QPoint origin READ origin
                              NOTIFY originChanged)
     Q_PROPERTY(QUrl background READ background
                                NOTIFY backgroundChanged)
     Q_PROPERTY(QRectF background_borders READ backgroundBorders
                                          NOTIFY backgroundBordersChanged)
-    Q_PROPERTY(int invisible_toucharea_height READ invisibleTouchAreaHeight
-                                         NOTIFY invisibleTouchAreaHeightChanged)
 
     Q_PROPERTY(State keyboard_state READ state WRITE setState
                             NOTIFY stateChanged)
@@ -131,9 +127,6 @@
     Q_SLOT int height() const;
     Q_SIGNAL void heightChanged(int changed);
 
-    Q_SLOT int wordRibbonHeight() const;
-    Q_SIGNAL void wordRibbonHeightChanged(int changed);
-
     Q_SLOT QPoint origin() const;
     Q_SIGNAL void originChanged(const QPoint &changed);
 
@@ -146,9 +139,6 @@
     // FIXME: Turn into class variable?
     Q_SLOT void setImageDirectory(const QString &directory);
 
-    Q_SLOT int invisibleTouchAreaHeight() const;
-    Q_SIGNAL void invisibleTouchAreaHeightChanged(int &changed);
-
     Q_SLOT State state() const;
     Q_SLOT void setState(Model::Layout::State state);
     Q_SIGNAL void stateChanged(Model::Layout::State state);

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2013-11-15 09:32:12 +0000
+++ src/plugin/inputmethod.cpp	2013-11-15 12:46:02 +0000
@@ -90,11 +90,10 @@
 
     connect(&d->editor,  SIGNAL(autoCapsActivated()), this, SIGNAL(activateAutocaps()));
 
-    connect(this, SIGNAL(wordRibbonEnabledChanged(bool)), uiConst, SLOT(onWordEngineSettingsChanged(bool)));
-
     connect(this, SIGNAL(predictionEnabledChanged()), this, SLOT(updateWordEngine()));
     connect(this, SIGNAL(contentTypeChanged(TextContentType)), this, SLOT(setContentType(TextContentType)));
     connect(this, SIGNAL(activeLanguageChanged(QString)), d->editor.wordEngine(), SLOT(onLanguageChanged(QString)));
+    connect(d->m_geometry, SIGNAL(visibleRectChanged()), this, SLOT(onVisibleRectChanged()));
 
     d->registerStyleSetting(host);
 
@@ -118,27 +117,6 @@
     Q_D(InputMethod);
 
     d->view->setVisible(true);
-
-    inputMethodHost()->setScreenRegion(QRegion(d->keyboardVisibleRect));
-
-    QRect rect(d->keyboardVisibleRect);
-    rect.moveTop( d->windowGeometryRect.height() - d->keyboardVisibleRect.height() );
-    inputMethodHost()->setInputMethodArea(rect, d->view);
-
-    qDebug() << "keyboard is reporting <x y w h>: <"
-                << d->keyboardVisibleRect.x()
-                << d->keyboardVisibleRect.y()
-                << d->keyboardVisibleRect.width()
-                << d->keyboardVisibleRect.height()
-                << "> to the app manager.";
-
-    d->applicationApiWrapper->reportOSKVisible(
-                d->keyboardVisibleRect.x(),
-                d->keyboardVisibleRect.y(),
-                d->keyboardVisibleRect.width(),
-                d->keyboardVisibleRect.height()
-                );
-
     d->m_geometry->setShown(true);
 }
 
@@ -522,3 +500,30 @@
     d->editor.onLanguageChanged(d->activeLanguage);
     Q_EMIT activeLanguageChanged(d->activeLanguage);
 }
+
+void InputMethod::onVisibleRectChanged()
+{
+    Q_D(InputMethod);
+
+    QRect visibleRect = qGuiApp->primaryScreen()->mapBetween(
+                            d->m_geometry->orientation(),
+                            qGuiApp->primaryScreen()->primaryOrientation(),
+                            d->m_geometry->visibleRect().toRect());
+
+    inputMethodHost()->setScreenRegion(QRegion(visibleRect));
+    inputMethodHost()->setInputMethodArea(visibleRect, d->view);
+
+    qDebug() << "keyboard is reporting <x y w h>: <"
+                << visibleRect.x()
+                << visibleRect.y()
+                << visibleRect.width()
+                << visibleRect.height()
+                << "> to the app manager.";
+
+    d->applicationApiWrapper->reportOSKVisible(
+                visibleRect.x(),
+                visibleRect.y(),
+                visibleRect.width(),
+                visibleRect.height()
+                );
+}

=== modified file 'src/plugin/inputmethod.h'
--- src/plugin/inputmethod.h	2013-11-13 15:19:04 +0000
+++ src/plugin/inputmethod.h	2013-11-15 12:46:02 +0000
@@ -109,6 +109,7 @@
 
     const QString &systemLanguage() const;
 
+    Q_SLOT void onVisibleRectChanged();
     bool useAudioFeedback() const;
 
 Q_SIGNALS:
@@ -122,6 +123,7 @@
     void useAudioFeedbackChanged();
     void wordEngineEnabledChanged(bool wordEngineEnabled);
     void wordRibbonEnabledChanged(bool wordRibbonEnabled);
+    void windowGeometryRectChanged(QRect rect);
 
 private:
     Q_SLOT void onStyleSettingChanged();

=== modified file 'src/plugin/inputmethod_p.h'
--- src/plugin/inputmethod_p.h	2013-11-15 09:33:31 +0000
+++ src/plugin/inputmethod_p.h	2013-11-15 12:46:02 +0000
@@ -10,7 +10,6 @@
 #include "logic/eventhandler.h"
 #include "logic/wordengine.h"
 #include "logic/languagefeatures.h"
-#include "logic/dynamiclayout.h"
 
 #include "ubuntuapplicationapiwrapper.h"
 
@@ -75,8 +74,6 @@
     QMap<QString, SharedOverride> key_overrides;
     Settings settings;
     LayoutGroup layout;
-    QRect windowGeometryRect;
-    QRect keyboardVisibleRect;
     MAbstractInputMethodHost* host;
     QQuickView* view;
     UbuntuApplicationApiWrapper* applicationApiWrapper;
@@ -185,57 +182,26 @@
         delete applicationApiWrapper;
     }
 
+    Logic::LayoutHelper::Orientation screenToMaliitOrientation(Qt::ScreenOrientation screenOrientation) const
+    {
+        switch (screenOrientation) {
+        case Qt::LandscapeOrientation:
+        case Qt::InvertedLandscapeOrientation:
+            return Logic::LayoutHelper::Landscape;
+            break;
+        case Qt::PortraitOrientation:
+        case Qt::InvertedPortraitOrientation:
+        case Qt::PrimaryOrientation:
+        default:
+            return Logic::LayoutHelper::Portrait;
+        }
+
+        return Logic::LayoutHelper::Portrait;
+    }
+
     void setLayoutOrientation(Qt::ScreenOrientation screenOrientation)
     {
-        Logic::LayoutHelper::Orientation orientation = uiConst->screenToMaliitOrientation(screenOrientation);
-
-        layout.updater.setOrientation(orientation);
-
-        windowGeometryRect = uiConst->windowGeometryRect( screenOrientation );
-
-        keyboardVisibleRect = windowGeometryRect.adjusted(0,uiConst->invisibleTouchAreaHeight(orientation),0,0);
-
-        m_geometry->setCanvasHeight(windowGeometryRect.height());
-        m_geometry->setKeypadHeight(keyboardVisibleRect.height());
         m_geometry->setOrientation(screenOrientation);
-
-        // qpa does not rotate the coordinate system
-        windowGeometryRect = qGuiApp->primaryScreen()->mapBetween(
-                        screenOrientation,
-                        qGuiApp->primaryScreen()->primaryOrientation(),
-                        windowGeometryRect);
-
-        if (m_geometry->shown()) {
-            host->setScreenRegion(QRegion(keyboardVisibleRect));
-
-            QRect rect(keyboardVisibleRect);
-            rect.moveTop( windowGeometryRect.height() - keyboardVisibleRect.height() );
-            host->setInputMethodArea(rect, view);
-        }
-
-        if (m_geometry->shown()) {
-            applicationApiWrapper->reportOSKInvisible();
-
-            qDebug() << "keyboard is reporting: total <x y w h>: <"
-                     << windowGeometryRect.x()
-                     << windowGeometryRect.y()
-                     << windowGeometryRect.width()
-                     << windowGeometryRect.height()
-                     << "> and visible <"
-                     << keyboardVisibleRect.x()
-                     << keyboardVisibleRect.y()
-                     << keyboardVisibleRect.width()
-                     << keyboardVisibleRect.height()
-                     << "> to the app manager.";
-
-            // report the visible part as input trap, the invisible part can click through, e.g. browser url bar
-            applicationApiWrapper->reportOSKVisible(
-                        keyboardVisibleRect.x(),
-                        keyboardVisibleRect.y(),
-                        keyboardVisibleRect.width(),
-                        keyboardVisibleRect.height()
-                        );
-        }
     }
 
     void updateWordRibbon()

=== added directory 'tests/unittests/ut_dynamic-layout'