aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorjohnsonj <unknown>2019-07-17 15:46:13 +1000
committerjohnsonj <unknown>2019-07-17 15:46:13 +1000
commitd273fb8b169cd9b4b7f6a24ff9b5f60e886376f4 (patch)
treec628b89799cff545b38b0884f5ee16b6c7a89ff2
parente27436cf52af98321cab1b288fc7c215af568277 (diff)
downloadscintilla-mirror-d273fb8b169cd9b4b7f6a24ff9b5f60e886376f4.tar.gz
Feature [feature-requests:#1300] part 4. Align candidate window to target part
of composition text.
-rw-r--r--doc/ScintillaHistory.html1
-rw-r--r--win32/ScintillaWin.cxx5
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index f75dfb496..3a144951a 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -571,6 +571,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 e19dca8b5..487b2bc02 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -1128,6 +1128,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;
}