From c1955f280084e316a587fa10469e4296ffc7371c Mon Sep 17 00:00:00 2001
From: johnsonj <unknown>
Date: Tue, 28 Jul 2015 18:44:13 +1000
Subject: Avoid candidate box randomly popping up away from edit pane with
 (especially Japanese) IME input.

---
 gtk/ScintillaGTK.cxx                       | 1 +
 qt/ScintillaEditBase/ScintillaEditBase.cpp | 1 +
 win32/ScintillaWin.cxx                     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index d08b944c8..c60554a23 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -2584,6 +2584,7 @@ void ScintillaGTK::PreeditChangedInlineThis() {
 			MoveImeCarets( - (imeCharPos[preeditStr.uniStrLen]) + imeCharPos[preeditStr.cursor_pos]);
 		}
 
+		EnsureCaretVisible();
 		SetCandidateWindowPos();
 		ShowCaretAtCurrentPosition();
 	} catch (...) {
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp
index a99e06d81..d462ddac7 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -568,6 +568,7 @@ void ScintillaEditBase::inputMethodEvent(QInputMethodEvent *event)
 
 		// Set candidate box position for Qt::ImMicroFocus.
 		preeditPos = sqt->CurrentPosition();
+		sqt->EnsureCaretVisible();
 		updateMicroFocus();
 	}
 	sqt->ShowCaretAtCurrentPosition();
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index d25cd51d8..db1e2b4d9 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -1068,6 +1068,7 @@ sptr_t ScintillaWin::HandleCompositionInline(uptr_t, sptr_t lParam) {
 			i += ucWidth;
 		}
 	}
+	EnsureCaretVisible();
 	SetCandidateWindowPos();
 	ShowCaretAtCurrentPosition();
 	::ImmReleaseContext(MainHWND(), hIMC);
-- 
cgit v1.2.3