Merge lp:~thomas-moenicke/phablet-extras/maliit-plugins-fix-1199150 into lp:phablet-extras/maliit-plugins

[Thomas Moenicke]

fix reporting keyboard rectangle, which is now relative to the QQuickView, instead of absolute screen position
fixes: #1199150

fix reporting keyboard rectangle, which is now relative to the QQuickView, instead of absolute screen position
fixes: #1199150

[lp:~thomas-moenicke/phablet-extras/maliit-plugins-fix-1199150]

2134. By Thomas Moenicke on 2013-07-10

fixed copy and paste issue

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2133
http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-ci/80/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/32/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-i386-ci/32/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-maliit-plugins-ci/80/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2134
http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-ci/81/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-i386-ci/33

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-maliit-plugins-ci/81/rebuild

review: Approve (continuous-integration)

[Thomas Moenicke (thomas-moenicke)]

tested on Phone and Tablet in both portrait and landscape

[Bill Filler (bfiller)]

change changelog entry to saucy instead of unreleased

review: Needs Fixing

[lp:~thomas-moenicke/phablet-extras/maliit-plugins-fix-1199150]

2135. By Thomas Moenicke on 2013-07-10

fix changelog

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2135
http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-ci/82/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-i386-ci/34

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-maliit-plugins-ci/82/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-03 14:32:14 +0000
+++ debian/changelog	2013-07-10 17:46:37 +0000
@@ -1,3 +1,9 @@
+maliit-plugins (0.99.trunk.phablet1) saucy; urgency=low
+
+  * fix reporting wrong keyboard rectangle
+
+ -- Thomas Moenicke <thomas@pachamama>  Wed, 10 Jul 2013 14:10:11 +0200
+
 maliit-plugins (0.99.trunk.phablet0) saucy; urgency=low
 
   * upgraded to 0.99 server

=== modified file 'maliit-keyboard/plugin/inputmethod.cpp'
--- maliit-keyboard/plugin/inputmethod.cpp	2013-07-04 08:33:23 +0000
+++ maliit-keyboard/plugin/inputmethod.cpp	2013-07-10 17:46:37 +0000
@@ -324,7 +324,10 @@
 
     if (qmlRootItem->property("shown").toBool()) {
         host->setScreenRegion(QRegion(keyboardVisibleRect));
-        host->setInputMethodArea(QRegion(keyboardVisibleRect));
+
+        QRect rect(keyboardVisibleRect);
+        rect.moveTop( windowGeometryRect.height() - keyboardVisibleRect.height() );
+        host->setInputMethodArea(rect, view);
     }
 
 #ifdef HAVE_UBUNTU_PLATFORM_API
@@ -483,7 +486,10 @@
     d->magnifier_surface->show();
 #endif
     inputMethodHost()->setScreenRegion(QRegion(d->keyboardVisibleRect));
-    inputMethodHost()->setInputMethodArea(QRegion(d->keyboardVisibleRect));
+
+    QRect rect(d->keyboardVisibleRect);
+    rect.moveTop( d->windowGeometryRect.height() - d->keyboardVisibleRect.height() );
+    inputMethodHost()->setInputMethodArea(rect, d->view);
 
 #ifdef HAVE_UBUNTU_PLATFORM_API
     qDebug() << "keyboard is reporting <x y w h>: <"