diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-07-25 14:04:38 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-07-25 14:11:01 +0200 |
| commit | f1e78a983829e26ae0b6f43268cf194c7bc67de1 (patch) | |
| tree | a6c83fe98652792a7a770e3fb7e5989e2ae07972 | |
| parent | 6e023d0fb2a63b970368f88c6f3d0fd94c2c727c (diff) | |
Text handles: fix input method commits
Change-Id: I1fa2240915b114c6b46360233fcea2b6cee86cd7
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| -rw-r--r-- | src/controls/Private/TextHandle.qml | 1 | ||||
| -rw-r--r-- | src/controls/Private/TextInputWithHandles.qml | 2 | ||||
| -rw-r--r-- | src/controls/TextArea.qml | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/src/controls/Private/TextHandle.qml b/src/controls/Private/TextHandle.qml index 5bef41946..147f61fa8 100644 --- a/src/controls/Private/TextHandle.qml +++ b/src/controls/Private/TextHandle.qml @@ -88,6 +88,7 @@ Loader { preventStealing = true } onPositionChanged: { + Qt.inputMethod.commit() var pt = mapToItem(editor, mouse.x - offset.x, mouse.y - offset.y) // limit vertically within mix/max coordinates or content bounds diff --git a/src/controls/Private/TextInputWithHandles.qml b/src/controls/Private/TextInputWithHandles.qml index 5eb1bd175..f955ed283 100644 --- a/src/controls/Private/TextInputWithHandles.qml +++ b/src/controls/Private/TextInputWithHandles.qml @@ -87,7 +87,6 @@ TextInput { function moveHandles(cursor, selection) { blockRecursion = true - Qt.inputMethod.commit() cursorPosition = cursor if (selection === -1) { selectWord() @@ -159,7 +158,6 @@ TextInput { input.blockRecursion = true if (!input.hasSelection) selectionHandle.position = cursorHandle.position - Qt.inputMethod.commit() input.select(selectionHandle.position, cursorHandle.position) input.blockRecursion = false } diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml index 9c68701cf..44c791220 100644 --- a/src/controls/TextArea.qml +++ b/src/controls/TextArea.qml @@ -824,7 +824,6 @@ ScrollView { function moveHandles(cursor, selection) { blockRecursion = true - Qt.inputMethod.commit() cursorPosition = cursor if (selection === -1) { selectWord() @@ -898,7 +897,6 @@ ScrollView { edit.blockRecursion = true if (!edit.hasSelection) selectionHandle.position = cursorHandle.position - Qt.inputMethod.commit() edit.select(selectionHandle.position, cursorHandle.position) edit.blockRecursion = false } |