diff options
| author | Andy Shaw <andy.shaw@theqtcompany.com> | 2015-08-04 17:49:39 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@theqtcompany.com> | 2015-08-10 12:30:48 +0000 |
| commit | d2f0f46c459bca229d30132f233e724d55490a78 (patch) | |
| tree | 609f6f3b66c52a417a63328b78384f6f8a21c52b /src | |
| parent | bec8c726bf76cda94f73efc76fef6bcea5bc133a (diff) | |
When the focus changes make sure that the IME finishes correctly
When clicking onto another widget while in the middle of composing should
cause it to be seen as an acceptance of the composed text so far instead
of just cancelling it outright.
This was validated against the Japanese, Korean and Chinese IMEs on
Windows 7.
Task-number: QTBUG-42344
Change-Id: I03be0cd099840f51a9550929f33e2afbbf31e85a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsinputcontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.cpp b/src/plugins/platforms/windows/qwindowsinputcontext.cpp index 0cce171340..c943438570 100644 --- a/src/plugins/platforms/windows/qwindowsinputcontext.cpp +++ b/src/plugins/platforms/windows/qwindowsinputcontext.cpp @@ -206,7 +206,7 @@ void QWindowsInputContext::setFocusObject(QObject *object) // remains active when this happens resulting in a lock-up. Consecutive // key events still have VK_PROCESSKEY set and are thus ignored. if (m_compositionContext.isComposing) - imeNotifyCancelComposition(m_compositionContext.hwnd); + reset(); const QWindow *window = QGuiApplication::focusWindow(); if (object && window && window->handle()) { |