aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorZufu Liu <unknown>2019-11-16 07:53:52 +1100
committerZufu Liu <unknown>2019-11-16 07:53:52 +1100
commit8fca4d7b901ad3fdcd984d491019aaaeeed720cd (patch)
tree128c28fd28d83bbc37a8265819bec17c7c6cd8e2
parent51e1fa7591f0b670f9b8c0486b5fbb53d1cc5531 (diff)
downloadscintilla-mirror-8fca4d7b901ad3fdcd984d491019aaaeeed720cd.tar.gz
Bug [#2137]. Clear IME state when switching language.
-rw-r--r--doc/ScintillaHistory.html4
-rw-r--r--win32/ScintillaWin.cxx3
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 9b4636955..02c8e8698 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -592,6 +592,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 e3bc4f711..6524ada5a 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();
}