phablet-extras

Merge lp:~thomas-moenicke/phablet-extras/maliit-framework-fix-inputMethodArea into lp:phablet-extras/maliit-framework

Proposed by Thomas Moenicke on 2013-03-28

Status:	Merged
Approved by:	Bill Filler on 2013-03-28
Approved revision:	1554
Merged at revision:	1553
Proposed branch:	lp:~thomas-moenicke/phablet-extras/maliit-framework-fix-inputMethodArea
Merge into:	lp:phablet-extras/maliit-framework
Diff against target:	32 lines (+11/-2) 2 files modified debian/changelog (+6/-0) src/minputmethodhost.cpp (+5/-2)
To merge this branch:	bzr merge lp:~thomas-moenicke/phablet-extras/maliit-framework-fix-inputMethodArea
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-03-28
Bill Filler		2013-03-28	Pending
Thomas Moenicke			Pending
Review via email: mp+155932@code.launchpad.net

fixes issue when keyboard shows up, it did not forward the new inputMethodArea to the app (merge issue in r1551)

fixes issue when keyboard shows up, it did not forward the new inputMethodArea to the app (merge issue in r1551)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-03-28:

review: Approve (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2013-03-28:

Approved

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

 === modified file 'debian/changelog'
 --- debian/changelog	2013-03-25 20:32:42 +0000
 +++ debian/changelog	2013-03-28 11:13:22 +0000
@@ -1,3 +1,9 @@
++maliit-framework (0.94.2phablet2) quantal; urgency=low
++
++  * fixes issue when keyboard shows up, it did not forward the new inputMethodArea to the app
++
++ -- Thomas Moenicke <thomas@pachamama>  Thu, 28 Mar 2013 12:10:27 +0100
++
  maliit-framework (0.94.2phablet1) quantal; urgency=low
    * Switching to version scheme similar to the one in ubuntu.
 === modified file 'src/minputmethodhost.cpp'
 --- src/minputmethodhost.cpp	2013-03-21 13:59:07 +0000
 +++ src/minputmethodhost.cpp	2013-03-28 11:13:22 +0000
@@ -209,9 +209,12 @@
+     }
+ }
--void MInputMethodHost::setInputMethodArea(const QRegion &)
++void MInputMethodHost::setInputMethodArea(const QRegion & r)
+ {
--    // TODO: remove function since it is handled by surfaces now
++  // note: this has been removed in upstream, but we still need this
++  if (enabled) {
++        connection->updateInputMethodArea(r);
++  }
+ }
  void MInputMethodHost::setSelection(int start, int length)