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

Proposed by Thomas Moenicke
Status: Merged
Approved by: Bill Filler
Approved revision: 1554
Merged at revision: 1554
Proposed branch: lp:~thomas-moenicke/phablet-extras/maliit-framework_new_default
Merge into: lp:phablet-extras/maliit-framework
Diff against target: 39 lines (+9/-1)
3 files modified
debian/changelog (+6/-0)
debian/rules (+1/-1)
maliit-plugins-quick/input-method/minputmethodquick.cpp (+2/-0)
To merge this branch: bzr merge lp:~thomas-moenicke/phablet-extras/maliit-framework_new_default
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Bill Filler (community) Approve
Review via email: mp+161711@code.launchpad.net

Commit message

maliit-keyboard is default
nemo-keyboard hides when inputfield looses focus

Description of the change

maliit-keyboard is default
nemo-keyboard hides when inputfield looses focus

To post a comment you must log in.
Revision history for this message
Bill Filler (bfiller) wrote :

approved

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

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-03-28 11:11:48 +0000
3+++ debian/changelog 2013-04-30 22:05:29 +0000
4@@ -1,3 +1,9 @@
5+maliit-framework (0.94.2phablet3) raring; urgency=low
6+
7+ * maliit-keyboard is default
8+
9+ -- Thomas Moenicke <thomas@huancayo> Tue, 30 Apr 2013 14:51:39 -0700
10+
11 maliit-framework (0.94.2phablet2) quantal; urgency=low
12
13 * fixes issue when keyboard shows up, it did not forward the new inputMethodArea to the app
14
15=== modified file 'debian/rules'
16--- debian/rules 2013-03-22 21:09:44 +0000
17+++ debian/rules 2013-04-30 22:05:29 +0000
18@@ -16,7 +16,7 @@
19 QMAKE_OPTIONS = \
20 M_IM_PREFIX=/usr \
21 MALIIT_SERVER_ARGUMENTS="-software -bypass-wm-hint" \
22- MALIIT_DEFAULT_PLUGIN=nemo-keyboard.qml \
23+ MALIIT_DEFAULT_PLUGIN=libmaliit-keyboard-plugin.so \
24 CONFIG+="disable-gtk-cache-update debug notests nogtk nodoc nosdk"
25 # nogtk nodoc
26
27
28=== modified file 'maliit-plugins-quick/input-method/minputmethodquick.cpp'
29--- maliit-plugins-quick/input-method/minputmethodquick.cpp 2013-03-25 16:05:44 +0000
30+++ maliit-plugins-quick/input-method/minputmethodquick.cpp 2013-04-30 22:05:29 +0000
31@@ -240,6 +240,8 @@
32 {
33 Q_D(MInputMethodQuick);
34 d->haveFocus = focusIn;
35+ if (not focusIn)
36+ hide();
37 }
38
39 void MInputMethodQuick::show()

Subscribers

People subscribed via source and target branches