diff options
-rw-r--r-- | doc/ScintillaHistory.html | 1 | ||||
-rwxr-xr-x | gtk/ScintillaGTK.cxx | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index f210d64eb..a3ebbddea 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -600,6 +600,7 @@ Improve IME behaviour on GTK. Set candidate position for windowed IME. Improve location of candidate window. + Prevent movement of candidate window while typing. <a href="https://sourceforge.net/p/scintilla/bugs/2135/">Bug #2135</a>. </li> </ul> diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 33313b264..3560d517d 100755 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -2388,8 +2388,11 @@ void ScintillaGTK::PreeditChangedInlineThis() { return; } - if (initialCompose) + if (initialCompose) { ClearBeforeTentativeStart(); + } + + SetCandidateWindowPos(); pdoc->TentativeStart(); // TentativeActive() from now on std::vector<int> indicator = MapImeIndicators(preeditStr.attrs, preeditStr.str); @@ -2423,7 +2426,6 @@ void ScintillaGTK::PreeditChangedInlineThis() { } EnsureCaretVisible(); - SetCandidateWindowPos(); ShowCaretAtCurrentPosition(); } catch (...) { errorStatus = SC_STATUS_FAILURE; |