diff options
author | johnsonj <devnull@localhost> | 2015-12-11 13:48:04 +1100 |
---|---|---|
committer | johnsonj <devnull@localhost> | 2015-12-11 13:48:04 +1100 |
commit | 12c9d309dcce04f81fd88cca47c815f62fcf8ff7 (patch) | |
tree | d806078a9b57a168c2f29a9f153ab62241a576ed | |
parent | fdc46e5d4307ef7481cffbe4f7aa895218e14227 (diff) | |
download | scintilla-mirror-12c9d309dcce04f81fd88cca47c815f62fcf8ff7.tar.gz |
Korean input by word fixed.
-rw-r--r-- | doc/ScintillaHistory.html | 3 | ||||
-rw-r--r-- | gtk/ScintillaGTK.cxx | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 03d41a19a..f44f66363 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -534,6 +534,9 @@ to the end of the cluster making it easier to understand editing actions. </li> <li> + On GTK+, Korean input by word fixed. + </li> + <li> On GTK+ on OS X, fix warning during destruction. <a href="http://sourceforge.net/p/scintilla/bugs/1777/">Bug #1777</a>. </li> diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 0d8943826..19576ce9e 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -2518,12 +2518,11 @@ void ScintillaGTK::PreeditChangedInlineThis() { recordingMacro = tmpRecordingMacro; // Move caret to ime cursor position. + MoveImeCarets( - (imeCharPos[preeditStr.uniStrLen]) + imeCharPos[preeditStr.cursor_pos]); + if (KoreanIME()) { + MoveImeCarets( - imeCharPos[1]); // always 2 bytes for DBCS or 3 bytes for UTF8. view.imeCaretBlockOverride = true; - MoveImeCarets( - (imeCharPos[preeditStr.uniStrLen])); - - } else { - MoveImeCarets( - (imeCharPos[preeditStr.uniStrLen]) + imeCharPos[preeditStr.cursor_pos]); } EnsureCaretVisible(); |