aboutsummaryrefslogtreecommitdiffhomepage
path: root/win32/ScintillaWin.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'win32/ScintillaWin.cxx')
-rw-r--r--win32/ScintillaWin.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 487b2bc02..98ea15cea 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -1914,6 +1914,11 @@ void ScintillaWin::NotifyCaretMove() {
void ScintillaWin::UpdateSystemCaret() {
if (hasFocus) {
+ if (pdoc->TentativeActive()) {
+ // ongoing inline mode IME composition, don't inform IME of system caret position.
+ // fix candidate window for Google Japanese IME moved on typing on Win7.
+ return;
+ }
if (HasCaretSizeChanged()) {
DestroySystemCaret();
CreateSystemCaret();