Merge lp:~mzanetti/reminders-app/fix-textfields into lp:reminders-app

Proposed by Michael Zanetti
Status: Merged
Approved by: Riccardo Padovani
Approved revision: 476
Merged at revision: 490
Proposed branch: lp:~mzanetti/reminders-app/fix-textfields
Merge into: lp:reminders-app
Prerequisite: lp:~rpadovani/reminders-app/predictiveTextTagInsertion
Diff against target: 25 lines (+2/-2)
2 files modified
src/app/qml/components/EditTagsDialog.qml (+1/-1)
src/app/qml/ui/NotebooksPage.qml (+1/-1)
To merge this branch: bzr merge lp:~mzanetti/reminders-app/fix-textfields
Reviewer Review Type Date Requested Status
Riccardo Padovani Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nekhelesh Ramananthan (community) code-review Approve
Review via email: mp+270760@code.launchpad.net

Commit message

fix predictive text input

To post a comment you must log in.
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

LGTM! InputMethodComposing helps detect if there is partial text entered (due to predictive text enabled) and should work as expected.

review: Approve (code-review)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:476
http://91.189.93.70:8080/job/reminders-app-ci/782/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/204

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/782/rebuild

review: Approve (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

lgtm, thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/qml/components/EditTagsDialog.qml'
2--- src/app/qml/components/EditTagsDialog.qml 2015-09-10 22:50:16 +0000
3+++ src/app/qml/components/EditTagsDialog.qml 2015-09-10 22:50:16 +0000
4@@ -98,7 +98,7 @@
5 border.width: units.dp(1)
6 border.color: "black"
7 height: Math.min(5, tagsListView.count) * units.gu(4)
8- visible: textField.text.length > 0 && (textField.focus || tagsListView.focus)
9+ visible: (textField.text.length > 0 || textField.inputMethodComposing) && (textField.focus || tagsListView.focus)
10
11 ListView {
12 id: tagsListView
13
14=== modified file 'src/app/qml/ui/NotebooksPage.qml'
15--- src/app/qml/ui/NotebooksPage.qml 2015-07-25 01:52:22 +0000
16+++ src/app/qml/ui/NotebooksPage.qml 2015-09-10 22:50:16 +0000
17@@ -207,7 +207,7 @@
18
19 Button {
20 text: i18n.tr("OK")
21- enabled: nameTextField.text
22+ enabled: nameTextField.text || nameTextField.inputMethodComposing
23 onClicked: {
24 renameNotebookDialog.accepted(nameTextField.text)
25 PopupUtils.close(renameNotebookDialog)

Subscribers

People subscribed via source and target branches