summaryrefslogtreecommitdiffstats
path: root/src/controls/TextField.qml
diff options
context:
space:
mode:
authorSamuel Nevala <samuel.nevala@digia.com>2014-09-17 09:44:09 +0300
committerSamuel Nevala <samuel.nevala@digia.com>2014-09-30 08:22:52 +0200
commit428adaff208793cda0be710d29cbe166c14b7dc7 (patch)
tree4a964333d24b8bbd09a7530aaa98b3517985c778 /src/controls/TextField.qml
parentebbf3629ae53755c3b5dd0912585a40545f391fc (diff)
Sticky virtual keyboard for TextField.
TextField closes software keyboard on done/enter pressed. In order to have option for sticky keyboard, don't hide it when Qt.ImhMultiLine input method hint is set. Task-number: QTBUG-38282 Change-Id: Ic9bd2d2317336d1724d11f2ca55e67dc1fdab3cb Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/controls/TextField.qml')
-rw-r--r--src/controls/TextField.qml4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml
index 4d31e9b88..666d13700 100644
--- a/src/controls/TextField.qml
+++ b/src/controls/TextField.qml
@@ -282,6 +282,7 @@ Control {
\li Qt.ImhDate - The text editor functions as a date field.
\li Qt.ImhTime - The text editor functions as a time field.
+ \li Qt.ImhMultiLine - The text editor doesn't close software input keyboard when Return or Enter key is pressed (since QtQuick.Controls 1.3).
\endlist
Flags that restrict input (exclusive flags) are:
@@ -653,7 +654,8 @@ Control {
onAccepted: {
Qt.inputMethod.commit()
- Qt.inputMethod.hide()
+ if (!(textInput.inputMethodHints & Qt.ImhMultiLine))
+ Qt.inputMethod.hide()
textfield.accepted()
}