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

Proposed by Thomas Moenicke
Status: Merged
Approved by: Bill Filler
Approved revision: 2135
Merged at revision: 2133
Proposed branch: lp:~thomas-moenicke/phablet-extras/maliit-plugins-fix-1199150
Merge into: lp:phablet-extras/maliit-plugins
Diff against target: 41 lines (+14/-2)
2 files modified
debian/changelog (+6/-0)
maliit-keyboard/plugin/inputmethod.cpp (+8/-2)
To merge this branch: bzr merge lp:~thomas-moenicke/phablet-extras/maliit-plugins-fix-1199150
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+173958@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
2134. By Thomas Moenicke on 2013-07-10

fixed copy and paste issue

Thomas Moenicke (thomas-moenicke) wrote :

tested on Phone and Tablet in both portrait and landscape

Bill Filler (bfiller) wrote :

change changelog entry to saucy instead of unreleased

review: Needs Fixing
2135. By Thomas Moenicke on 2013-07-10

fix changelog

Bill Filler (bfiller) wrote :

approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-07-03 14:32:14 +0000
3+++ debian/changelog 2013-07-10 17:46:37 +0000
4@@ -1,3 +1,9 @@
5+maliit-plugins (0.99.trunk.phablet1) saucy; urgency=low
6+
7+ * fix reporting wrong keyboard rectangle
8+
9+ -- Thomas Moenicke <thomas@pachamama> Wed, 10 Jul 2013 14:10:11 +0200
10+
11 maliit-plugins (0.99.trunk.phablet0) saucy; urgency=low
12
13 * upgraded to 0.99 server
14
15=== modified file 'maliit-keyboard/plugin/inputmethod.cpp'
16--- maliit-keyboard/plugin/inputmethod.cpp 2013-07-04 08:33:23 +0000
17+++ maliit-keyboard/plugin/inputmethod.cpp 2013-07-10 17:46:37 +0000
18@@ -324,7 +324,10 @@
19
20 if (qmlRootItem->property("shown").toBool()) {
21 host->setScreenRegion(QRegion(keyboardVisibleRect));
22- host->setInputMethodArea(QRegion(keyboardVisibleRect));
23+
24+ QRect rect(keyboardVisibleRect);
25+ rect.moveTop( windowGeometryRect.height() - keyboardVisibleRect.height() );
26+ host->setInputMethodArea(rect, view);
27 }
28
29 #ifdef HAVE_UBUNTU_PLATFORM_API
30@@ -483,7 +486,10 @@
31 d->magnifier_surface->show();
32 #endif
33 inputMethodHost()->setScreenRegion(QRegion(d->keyboardVisibleRect));
34- inputMethodHost()->setInputMethodArea(QRegion(d->keyboardVisibleRect));
35+
36+ QRect rect(d->keyboardVisibleRect);
37+ rect.moveTop( d->windowGeometryRect.height() - d->keyboardVisibleRect.height() );
38+ inputMethodHost()->setInputMethodArea(rect, d->view);
39
40 #ifdef HAVE_UBUNTU_PLATFORM_API
41 qDebug() << "keyboard is reporting <x y w h>: <"

Subscribers

People subscribed via source and target branches