diff options
| author | johnsonj <unknown> | 2016-03-10 15:17:37 +1100 |
|---|---|---|
| committer | johnsonj <unknown> | 2016-03-10 15:17:37 +1100 |
| commit | c1eb61abcce401f2d32df561685ef962081c4ee4 (patch) | |
| tree | e04ec30a4c28cc641a5987e4508b71cd75a8c0a8 | |
| parent | 0175c47bf5256941d7c6c34305bfb426b01b2964 (diff) | |
| download | scintilla-mirror-c1eb61abcce401f2d32df561685ef962081c4ee4.tar.gz | |
Fix caret position bug on Qt and Gtk for win32 for Korean.rel-3-6-4
| -rw-r--r-- | doc/ScintillaHistory.html | 3 | ||||
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 2 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.cpp | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 1c0d7db19..a5df7057c 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -554,6 +554,9 @@ <a href="http://sourceforge.net/p/scintilla/bugs/1813/">Bug #1813</a>. </li> <li> + On GTK+ and Qt over Win32 in Korean fix bug caused by last release's word input change. + </li> + <li> For SciTE, more descriptive error messages are displayed when there are problems loading the Lua startup script. <a href="http://sourceforge.net/p/scintilla/feature-requests/1139/">Feature #1139.</a> diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index dc5f08257..25e160510 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -2485,7 +2485,9 @@ void ScintillaGTK::PreeditChangedInlineThis() { MoveImeCarets( - (imeCharPos[preeditStr.uniStrLen]) + imeCharPos[preeditStr.cursor_pos]); if (KoreanIME()) { +#if !PLAT_GTK_WIN32 MoveImeCarets( - imeCharPos[1]); // always 2 bytes for DBCS or 3 bytes for UTF8. +#endif view.imeCaretBlockOverride = true; } diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp index ca4819726..7d24d0f4c 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.cpp +++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp @@ -570,7 +570,9 @@ void ScintillaEditBase::inputMethodEvent(QInputMethodEvent *event) MoveImeCarets(- imeCharPos[preeditStrLen] + imeCharPos[imeCaretPos]); if (IsHangul(preeditStr.at(0))) { +#ifndef Q_OS_WIN MoveImeCarets(- imeCharPos[1]); +#endif sqt->view.imeCaretBlockOverride = true; } |