diff options
| author | Zufu Liu <unknown> | 2020-01-06 23:20:29 +1100 |
|---|---|---|
| committer | Zufu Liu <unknown> | 2020-01-06 23:20:29 +1100 |
| commit | 949adf1131a2c308bbb7a549959028d9af4834d8 (patch) | |
| tree | 1da6401040f0028227685b8bd15b732ddb51fc3c | |
| parent | 25b829a0ba90b6c8915b2f71a155e54dc20cb43a (diff) | |
| download | scintilla-mirror-949adf1131a2c308bbb7a549959028d9af4834d8.tar.gz | |
Backport: Bug [#2135]. Prevent movement of candidate window while typing.
Backport of changeset 7949:59f3c5ced2e2.
| -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 8a605f179..884d0fa98 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -587,6 +587,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 5b0c9b940..c528641fb 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; |