diff options
| author | johnsonj <devnull@localhost> | 2015-12-13 12:04:37 +1100 |
|---|---|---|
| committer | johnsonj <devnull@localhost> | 2015-12-13 12:04:37 +1100 |
| commit | eeb150883f74d5908872d71087814e73f4dd640e (patch) | |
| tree | 2cd2be87955895ccbd35752fbd38eb92b3f611a3 | |
| parent | 648f9fe5d61c8d7b424b7208b74f6fc6bbf94131 (diff) | |
| download | scintilla-mirror-eeb150883f74d5908872d71087814e73f4dd640e.tar.gz | |
Korean input by word fixed.
| -rw-r--r-- | doc/ScintillaHistory.html | 2 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index c39e39a03..57680f59a 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -538,7 +538,7 @@ to the end of the cluster making it easier to understand editing actions. </li> <li> - On GTK+, Korean input by word fixed. + On GTK+ and Qt, Korean input by word fixed. </li> <li> On GTK+ on OS X, fix warning during destruction. diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp index 68cdc9e36..ea516fe17 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.cpp +++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp @@ -564,11 +564,11 @@ void ScintillaEditBase::inputMethodEvent(QInputMethodEvent *event) sqt->recordingMacro = recording; // Move IME carets. + MoveImeCarets(- imeCharPos[preeditStrLen] + imeCharPos[imeCaretPos]); + if (IsHangul(preeditStr.at(0))) { + MoveImeCarets(- imeCharPos[1]); sqt->view.imeCaretBlockOverride = true; - MoveImeCarets(- imeCharPos[preeditStrLen]); - } else { - MoveImeCarets(- imeCharPos[preeditStrLen] + imeCharPos[imeCaretPos]); } // Set candidate box position for Qt::ImMicroFocus. |