diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 12 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 6 |
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(); |