diff options
| author | Zufu Liu <unknown> | 2020-03-11 15:58:58 +1100 |
|---|---|---|
| committer | Zufu Liu <unknown> | 2020-03-11 15:58:58 +1100 |
| commit | 5e690f90debfb95ea26b9779cefa41e48d2e6a8d (patch) | |
| tree | bb026def113a4ab8aef13827cf23d403d7c57628 /win32/ScintillaWin.cxx | |
| parent | 633ba5fe3f1aef0be3a4d475454fbf57ca5fa1fe (diff) | |
| download | scintilla-mirror-5e690f90debfb95ea26b9779cefa41e48d2e6a8d.tar.gz | |
Handle Japanese IME input when both GCS_COMPSTR and GCS_RESULTSTR set.
Diffstat (limited to 'win32/ScintillaWin.cxx')
| -rw-r--r-- | win32/ScintillaWin.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
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(); |