diff options
| author | Zufu Liu <unknown> | 2019-11-16 07:53:52 +1100 |
|---|---|---|
| committer | Zufu Liu <unknown> | 2019-11-16 07:53:52 +1100 |
| commit | 04e1669d6e6271b76955dce95bb19cac46ffe417 (patch) | |
| tree | a4925f5b9a2a8a095c2c11bf004296cc071cf113 | |
| parent | fe7667b310bc4888bdc288635ff63cd6fac1c6d9 (diff) | |
| download | scintilla-mirror-04e1669d6e6271b76955dce95bb19cac46ffe417.tar.gz | |
Backport: Bug [#2137]. Clear IME state when switching language.
Backport of changeset 7763:9e086fbcc756.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 63bc56b1d..87a0964fb 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -581,6 +581,10 @@ <a href="https://sourceforge.net/p/scintilla/feature-requests/1304/">Feature #1304</a>. </li> <li> + Clear IME state when switching language on Win32. + <a href="https://sourceforge.net/p/scintilla/bugs/2137/">Bug #2137</a>. + </li> + <li> Setting rectangular selection made faster. <a href="https://sourceforge.net/p/scintilla/bugs/2130/">Bug #2130</a>. </li> diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index a04b03fa5..ef2782fe7 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -2743,6 +2743,9 @@ void ScintillaWin::ImeStartComposition() { /** Called when IME Window closed. */ void ScintillaWin::ImeEndComposition() { + // clear IME composition state. + view.imeCaretBlockOverride = false; + pdoc->TentativeUndo(); ShowCaretAtCurrentPosition(); } |