From fecdeef26e29f36b9a81084a0fcfac3fd0bcd335 Mon Sep 17 00:00:00 2001
From: Zufu Liu <unknown>
Date: Mon, 6 Jan 2020 23:06:44 +1100
Subject: Bug [#2135]. Set candidate window position in windowed IME mode.

---
 doc/ScintillaHistory.html | 5 +++++
 gtk/ScintillaGTK.cxx      | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index f1fa9c3b9..39e82ef33 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -596,6 +596,11 @@
 	On Win32, remove support for CF_TEXT clipboard format as Windows will convert to
 	CF_UNICODETEXT.
 	</li>
+	<li>
+	Improve IME behaviour on GTK.
+	Set candidate position for windowed IME.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2135/">Bug #2135</a>.
+	</li>
     </ul>
     <h3>
        <a href="https://www.scintilla.org/scite423.zip">Release 4.2.3</a>
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index f8a2b5c9b..c02c07365 100755
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -2432,6 +2432,8 @@ void ScintillaGTK::PreeditChangedWindowedThis() {
 	try {
 		PreEditString pes(im_context);
 		if (strlen(pes.str) > 0) {
+			SetCandidateWindowPos();
+
 			PangoLayout *layout = gtk_widget_create_pango_layout(PWidget(wText), pes.str);
 			pango_layout_set_attributes(layout, pes.attrs);
 
-- 
cgit v1.2.3