AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: Handle replacement range during marking of text

Browse Source 
The input method may include already committed text when marking text,
in which case the replacement range reflects the position and length
of the existing text.

We handle this the same way we do replacement ranges in insertText.

Pick-to: 6.2
Change-Id: I148e4701318a59c7e0d9441d157199d7c8606f43
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Tor Arne Vestbø 2021-08-27 15:47:39 +02:00
parent f97e936049
commit a56b915f71
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/platforms/cocoa/qnsview_complextext.mm
View File

@ -258,12 +258,28 @@
index = range.location + range.length;
}
// Ensure we have a valid replacement range
replacementRange = [self sanitizeReplacementRange:replacementRange];
// Qt's QInputMethodEvent has different semantics for the replacement
// range than AppKit does, so we need to sanitize the range first.
auto [replaceFrom, replaceLength] = [self inputMethodRangeForRange:replacementRange];
// Update the composition, now that we've computed the replacement range
m_composingText = preeditString;
if (QObject *focusObject = m_platformWindow->window()->focusObject()) {
m_composingFocusObject = focusObject;
if (queryInputMethod(focusObject)) {
QInputMethodEvent event(preeditString, preeditAttributes);
if (replaceLength > 0) {
// The input method may extend the preedit into already
// committed text. If so, we need to replace existing text
// by committing an empty string.
qCDebug(lcQpaKeys) << "Replacing from" << replaceFrom << "with length"
<< replaceLength << "based on replacement range" << replacementRange;
event.setCommitString(QString(), replaceFrom, replaceLength);
}
QCoreApplication::sendEvent(focusObject, &event);
// prevent handleKeyEvent from sending a key event
m_sendKeyEvent = false;