Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1402878 into lp:ubuntu-keyboard

Proposed by Michael Sheldon on 2015-01-19
Status: Merged
Approved by: Olivier Tilloy on 2015-01-19
Approved revision: 286
Merged at revision: 287
Proposed branch: lp:~michael-sheldon/ubuntu-keyboard/fix-1402878
Merge into: lp:ubuntu-keyboard
Diff against target: 12 lines (+3/-0)
1 file modified
src/plugin/inputmethod.cpp (+3/-0)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-keyboard/fix-1402878
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-01-19
Olivier Tilloy 2015-01-19 Approve on 2015-01-19
Review via email: mp+246890@code.launchpad.net

Commit message

Deactivate autocaps if we receive find out we're in a field that doesn't support it after having already entered the field

Description of the change

Deactivate autocaps if we receive find out we're in a field that doesn't support it after having already entered the field

To post a comment you must log in.
Michael Sheldon (michael-sheldon) wrote :

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

Olivier Tilloy (osomon) wrote :

Not functionally tested, but the change looks good to me (will test in a silo).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/plugin/inputmethod.cpp'
2--- src/plugin/inputmethod.cpp 2014-12-05 00:49:11 +0000
3+++ src/plugin/inputmethod.cpp 2015-01-19 13:35:04 +0000
4@@ -268,6 +268,9 @@
5 if (enabled != d->autocapsEnabled) {
6 d->autocapsEnabled = enabled;
7 d->editor.setAutoCapsEnabled(enabled);
8+ if (!enabled) {
9+ Q_EMIT deactivateAutocaps();
10+ }
11 }
12 }
13

Subscribers

People subscribed via source and target branches