diff options
| author | johnsonj <unknown> | 2019-07-17 15:49:13 +1000 |
|---|---|---|
| committer | johnsonj <unknown> | 2019-07-17 15:49:13 +1000 |
| commit | 5feb3f8ea47e2628249300575ff207a04b67eca4 (patch) | |
| tree | 737d309dac9b0c4eca26d7c9370b385f1630e39e | |
| parent | ba826379b8cf8f61d4243b7957e81989d57896db (diff) | |
| download | scintilla-mirror-5feb3f8ea47e2628249300575ff207a04b67eca4.tar.gz | |
Backport: Feature [feature-requests:#1300] part 5. Stop Google IME on Windows 7 moving
while typing.
Backport of changeset 7687:785372d12384.
| -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 fb4252565..73e335699 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -558,6 +558,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 67cbd2d79..f4d7300e3 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -1908,6 +1908,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(); |