ubuntu-keyboard

Merge lp:~gerboland/ubuntu-keyboard/fix-osk-on-app-close into lp:ubuntu-keyboard

  1. fix-osk-on-app-close
  2. Merge into trunk
Proposed by Gerry Boland
Status: Merged
Approved by: Bill Filler
Approved revision: 124
Merged at revision: 124
Proposed branch: lp:~gerboland/ubuntu-keyboard/fix-osk-on-app-close
Merge into: lp:ubuntu-keyboard
Diff against target: 31 lines (+10/-0)
2 files modified
src/plugin/inputmethod.cpp (+9/-0)
src/plugin/inputmethod.h (+1/-0)
To merge this branch: bzr merge lp:~gerboland/ubuntu-keyboard/fix-osk-on-app-close
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+201748@code.launchpad.net

Commit message

Implement handleClientChanged method to react correctly to client connect/disconnect.

Description of the change

Implement handleClientChanged method to react correctly to client connect/disconnect.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:124
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/310/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/139
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/139/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/138

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/310/rebuild

review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

tested, works

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 2013-11-21 13:26:12 +0000
3+++ src/plugin/inputmethod.cpp 2014-01-15 10:51:30 +0000
4@@ -209,6 +209,15 @@
5 d->setLayoutOrientation(d->appsCurrentOrientation);
6 }
7
8+void InputMethod::handleClientChange()
9+{
10+ // Clients connect to Maliit on startup and disconnect at quit. This method is called
11+ // for both those events. It makes sense to hide the keyboard always on these events,
12+ // especially if the client crashes, so that the OSK is closed. Fixes bug lp:1267550
13+ // Note that clients request OSK to appear & disappear with focus events.
14+ hide();
15+}
16+
17 bool InputMethod::imExtensionEvent(MImExtensionEvent *event)
18 {
19 Q_D(InputMethod);
20
21=== modified file 'src/plugin/inputmethod.h'
22--- src/plugin/inputmethod.h 2013-11-15 14:19:50 +0000
23+++ src/plugin/inputmethod.h 2014-01-15 10:51:30 +0000
24@@ -84,6 +84,7 @@
25 virtual QString activeSubView(Maliit::HandlerState state = Maliit::OnScreen) const;
26 virtual void handleFocusChange(bool focusIn);
27 virtual void handleAppOrientationChanged(int angle);
28+ virtual void handleClientChange();
29 virtual bool imExtensionEvent(MImExtensionEvent *event);
30 virtual void setKeyOverrides(const QMap<QString, QSharedPointer<MKeyOverride> > &overrides);
31 //! \reimp_end

Subscribers

People subscribed via source and target branches