aboutsummaryrefslogtreecommitdiffhomepage
path: root/win32
diff options
context:
space:
mode:
authorjohnsonj <unknown>2019-07-17 15:49:13 +1000
committerjohnsonj <unknown>2019-07-17 15:49:13 +1000
commit5feb3f8ea47e2628249300575ff207a04b67eca4 (patch)
tree737d309dac9b0c4eca26d7c9370b385f1630e39e /win32
parentba826379b8cf8f61d4243b7957e81989d57896db (diff)
downloadscintilla-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.
Diffstat (limited to 'win32')
-rw-r--r--win32/ScintillaWin.cxx5
1 files changed, 5 insertions, 0 deletions
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();