aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorZufu Liu <unknown>2020-01-06 23:20:29 +1100
committerZufu Liu <unknown>2020-01-06 23:20:29 +1100
commit8daffd01bafce7eca8400f2f2b60acdb7d76db5e (patch)
tree414500d699b97376d8aad3b80911f6f8c92ba398
parent6be5feeb0635f4b0c51cb59b2b4eacfb9efda69f (diff)
downloadscintilla-mirror-8daffd01bafce7eca8400f2f2b60acdb7d76db5e.tar.gz
Bug [#2135]. Prevent movement of candidate window while typing.
-rw-r--r--doc/ScintillaHistory.html1
-rwxr-xr-xgtk/ScintillaGTK.cxx6
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;