diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 1 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 3a144951a..61261ceb0 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -572,6 +572,7 @@ Position candidate window closer to composition text.<br /> Stop candidate window moving while typing.<br /> Align candidate window to target part of composition text.<br /> + Stop Google IME on Windows 7 moving while typing.<br /> <a href="https://sourceforge.net/p/scintilla/bugs/2120/">Bug #2120</a>. <a href="https://sourceforge.net/p/scintilla/feature-requests/1300/">Feature #1300</a>. </li> 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(); |