diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 3 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 48639f6e0..29ebce988 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -601,6 +601,9 @@ On Qt, stop movement of IME candidate box. </li> <li> + On Qt, report correct caret position within paragraph for IME retrieve surrounding text. + </li> + <li> On Qt for Cocoa, fix crash in entry of multi-character strings with IME. </li> </ul> diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp index b6c35f16e..416d74416 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.cpp +++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp @@ -655,7 +655,7 @@ QVariant ScintillaEditBase::inputMethodQuery(Qt::InputMethodQuery query) const case Qt::ImCursorPosition: { const Scintilla::Position paraStart = sqt->pdoc->ParaUp(pos); - return QVariant(static_cast<int>(pos - paraStart)); + return static_cast<int>(sqt->pdoc->CountUTF16(paraStart, pos)); } case Qt::ImSurroundingText: |