aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorZufu Liu <unknown>2020-03-11 15:58:58 +1100
committerZufu Liu <unknown>2020-03-11 15:58:58 +1100
commit5e690f90debfb95ea26b9779cefa41e48d2e6a8d (patch)
treebb026def113a4ab8aef13827cf23d403d7c57628
parent633ba5fe3f1aef0be3a4d475454fbf57ca5fa1fe (diff)
downloadscintilla-mirror-5e690f90debfb95ea26b9779cefa41e48d2e6a8d.tar.gz
Handle Japanese IME input when both GCS_COMPSTR and GCS_RESULTSTR set.
-rw-r--r--doc/ScintillaHistory.html12
-rw-r--r--win32/ScintillaWin.cxx6
2 files changed, 16 insertions, 2 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index e2652f53f..926639037 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -563,6 +563,18 @@
</li>
</ul>
<h3>
+ <a href="https://www.scintilla.org/scite432.zip">Release 4.3.3</a>
+ </h3>
+ <ul>
+ <li>
+ Released 6 March 2020.
+ </li>
+ <li>
+ On Win32 fix handling Japanese IME input when both GCS_COMPSTR and
+ GCS_RESULTSTR set.
+ </li>
+ </ul>
+ <h3>
<a href="https://www.scintilla.org/scite432.zip">Release 4.3.2</a>
</h3>
<ul>
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 98d988395..eab1ff796 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -1127,6 +1127,10 @@ sptr_t ScintillaWin::HandleCompositionInline(uptr_t, sptr_t lParam) {
view.imeCaretBlockOverride = false;
+ if (lParam & GCS_RESULTSTR) {
+ AddWString(imc.GetCompositionString(GCS_RESULTSTR), CharacterSource::imeResult);
+ }
+
if (lParam & GCS_COMPSTR) {
const std::wstring wcs = imc.GetCompositionString(GCS_COMPSTR);
if (wcs.empty()) {
@@ -1187,8 +1191,6 @@ sptr_t ScintillaWin::HandleCompositionInline(uptr_t, sptr_t lParam) {
if (KoreanIME()) {
view.imeCaretBlockOverride = true;
}
- } else if (lParam & GCS_RESULTSTR) {
- AddWString(imc.GetCompositionString(GCS_RESULTSTR), CharacterSource::imeResult);
}
EnsureCaretVisible();
ShowCaretAtCurrentPosition();