diff options
| author | Rainer Keller <rainer.keller@digia.com> | 2014-02-25 10:01:20 +0100 |
|---|---|---|
| committer | Rainer Keller <rainer.keller@digia.com> | 2014-02-26 09:18:10 +0200 |
| commit | 07f65e7e1150b5487bbf9a268fe652cebb3b7570 (patch) | |
| tree | 38bd70f1d0629dcba8e1ac7f33e75b5d94ab35b1 /basicsuite/textinput/TextBase.qml | |
| parent | b6c311a039f520cf9a681708a5d94d2034b4b1a9 (diff) | |
Merge updates from upstream into keyboard example
Change-Id: I0b48f285e63f88788ca6015a1d7a53edaccd35b8
Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
Diffstat (limited to 'basicsuite/textinput/TextBase.qml')
| -rw-r--r-- | basicsuite/textinput/TextBase.qml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/basicsuite/textinput/TextBase.qml b/basicsuite/textinput/TextBase.qml index 67ee3e3..916b3e2 100644 --- a/basicsuite/textinput/TextBase.qml +++ b/basicsuite/textinput/TextBase.qml @@ -49,7 +49,7 @@ FocusScope { property int fontPixelSize: 32 property string previewText property string enterKeyText - property bool enterKeyEnabled: true + property bool enterKeyEnabled: enterKeyText.length === 0 || editor.text.length > 0 || editor.inputMethodComposing property alias mouseParent: mouseArea.parent implicitHeight: editor.height + 12 @@ -86,6 +86,8 @@ FocusScope { parent: textBase anchors.fill: parent onClicked: { + if (editor.inputMethodComposing) + Qt.inputMethod.commit() var positionInEditor = mapToItem(editor, mouseX, mouseY) var cursorPosition = editor.positionAt(positionInEditor.x, positionInEditor.y) editor.cursorPosition = cursorPosition |