diff options
| author | johnsonj <unknown> | 2019-07-17 15:46:13 +1000 |
|---|---|---|
| committer | johnsonj <unknown> | 2019-07-17 15:46:13 +1000 |
| commit | ba826379b8cf8f61d4243b7957e81989d57896db (patch) | |
| tree | a29eac5b03b4bf720f1ff50b1c3c0bd0ecbad27d | |
| parent | 1b6a730a1879de901b909ce2fbe5a3073b4144ad (diff) | |
| download | scintilla-mirror-ba826379b8cf8f61d4243b7957e81989d57896db.tar.gz | |
Backport: Feature [feature-requests:#1300] part 4. Align candidate window to target part
of composition text.
Backport of changeset 7686:7761c6b46433.
| -rw-r--r-- | doc/ScintillaHistory.html | 1 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index e299e9c7a..fb4252565 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -557,6 +557,7 @@ Stop candidate window overlapping composition text and taskbar.<br /> Position candidate window closer to composition text.<br /> Stop candidate window moving while typing.<br /> + Align candidate window to target part of composition text.<br /> <a href="https://sourceforge.net/p/scintilla/bugs/2120/">Bug #2120</a>. <a href="https://sourceforge.net/p/scintilla/feature-requests/1300/">Feature #1300</a>. </li> diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index b70934a80..67cbd2d79 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -1132,6 +1132,11 @@ sptr_t ScintillaWin::HandleCompositionInline(uptr_t, sptr_t lParam) { MoveImeCarets(- CurrentPosition() + imeCaretPosDoc); + if (std::find(imeIndicator.begin(), imeIndicator.end(), SC_INDICATOR_TARGET) != imeIndicator.end()) { + // set candidate window left aligned to beginning of target string. + SetCandidateWindowPos(); + } + if (KoreanIME()) { view.imeCaretBlockOverride = true; } |