diff options
| author | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2021-06-17 14:07:38 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-17 14:42:42 +0000 |
| commit | ae1224cca97b70c1b1bff8b12197f5392bfb314d (patch) | |
| tree | f540a07922bfc826fd489e60b6395affdc17b044 | |
| parent | afd57cd61112a3696a1a438c66d9438183fa1607 (diff) | |
plugins/openwnn: Set word candidate index when item is selected
When an item is selected from the word candidate list, the
activeWordIndex variable was not updated to match the selected index,
resulting in a missed list update.
Fixes: QTBUG-94560
Change-Id: I5757081a1269439fe39d5b5e93dd6f43382cce15
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit c502a07d2db51063feaf7210ba5b09d61ff5b027)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/openwnn/plugin/openwnninputmethod.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/inputpanel/data/tst_inputpanel.qml | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/plugins/openwnn/plugin/openwnninputmethod.cpp b/src/plugins/openwnn/plugin/openwnninputmethod.cpp index 81e933fc..b3557cab 100644 --- a/src/plugins/openwnn/plugin/openwnninputmethod.cpp +++ b/src/plugins/openwnn/plugin/openwnninputmethod.cpp @@ -805,6 +805,7 @@ void OpenWnnInputMethod::selectionListItemSelected(QVirtualKeyboardSelectionList { Q_UNUSED(type); Q_D(OpenWnnInputMethod); + d->activeWordIndex = index; // Set selected text as preeditText to place cursor at the end of selected text inputContext()->setPreeditText(d->candidateList.at(index)->candidate); d->commitText(*d->candidateList.at(index)); diff --git a/tests/auto/inputpanel/data/tst_inputpanel.qml b/tests/auto/inputpanel/data/tst_inputpanel.qml index 03ca7cbf..91394bea 100644 --- a/tests/auto/inputpanel/data/tst_inputpanel.qml +++ b/tests/auto/inputpanel/data/tst_inputpanel.qml @@ -1249,6 +1249,19 @@ Rectangle { compare(textInput.cursorPosition, data.expectedCursorPosition) } + function test_japaneseSelectCurrentItemResetsIndex() { + prepareTest({ initLocale: "ja_JP" }, true) + + verify(inputPanel.virtualKeyClick("a")) + verify(inputPanel.virtualKeyClick("a")) + verify(inputPanel.virtualKeyClick("a")) + + compare(inputPanel.wordCandidateView.currentIndex, -1) + inputPanel.wordCandidateView.currentIndex = 0 + inputPanel.selectionListSelectCurrentItem() + compare(inputPanel.wordCandidateView.currentIndex, -1, "QTBUG-94560") + } + function test_baseKeyNoModifier() { // The Japanese keyboard uses the BaseKey.noModifier flag for the arrow keys. // Without this flag the arrow key + shift would extend the text selection. |