Merge lp:~bfiller/notes-app/fix-keyboard-hide into lp:notes-app

Proposed by Bill Filler on 2013-05-31
Status: Merged
Approved by: Renato Araujo Oliveira Filho on 2013-05-31
Approved revision: 124
Merged at revision: 125
Proposed branch: lp:~bfiller/notes-app/fix-keyboard-hide
Merge into: lp:notes-app
Diff against target: 41 lines (+10/-12)
2 files modified
Components/TextDelegate.qml (+0/-12)
NotesApp.qml (+10/-0)
To merge this branch: bzr merge lp:~bfiller/notes-app/fix-keyboard-hide
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2013-05-31
Renato Araujo Oliveira Filho (community) 2013-05-31 Approve on 2013-05-31
Review via email: mp+166850@code.launchpad.net

Commit message

fix for lp:1182108 keyboard not hiding

Description of the change

fix for lp:1182108 keyboard not hiding

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Components/TextDelegate.qml'
2--- Components/TextDelegate.qml 2013-04-30 22:22:15 +0000
3+++ Components/TextDelegate.qml 2013-05-31 16:37:39 +0000
4@@ -34,16 +34,4 @@
5 textArea.cursorPosition = textArea.text.length
6 }
7
8- Connections {
9- target: Qt.inputMethod
10- onVisibleChanged: {
11- // This event is received by *all* delegates, but we want to defocus
12- // only the current one when the OSK disappear.
13- // We want to defocus because otherwise when the user clicks again on
14- // the text area the OSK will not come up again if the focus is still there.
15- if (!Qt.inputMethod.visible && textArea.activeFocus) {
16- textArea.focus = false;
17- }
18- }
19- }
20 }
21
22=== modified file 'NotesApp.qml'
23--- NotesApp.qml 2013-05-21 15:59:52 +0000
24+++ NotesApp.qml 2013-05-31 16:37:39 +0000
25@@ -99,6 +99,16 @@
26 focus: true
27 model: dataModel
28 }
29+
30+ Connections {
31+ target: Qt.inputMethod
32+ onVisibleChanged: {
33+ if (!Qt.inputMethod.visible) {
34+ noteList.focus = true;
35+ }
36+ }
37+ }
38+
39 }
40
41 function createNewNote() {

Subscribers

People subscribed via source and target branches