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

macOS: Clean up code style in [QNSView setMarkedText:]

Browse Source 
Pick-to: 6.2
Change-Id: I8a901ac81b64e6fc9bd7fe9ea4e3eaa6257118ce
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Tor Arne Vestbø 2021-08-19 16:56:53 +02:00
parent 6c5f996974
commit 88550e1210
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,41 +129,41 @@
const bool isAttributedString = [text isKindOfClass:NSAttributedString.class];
QString preeditString = QString::fromNSString(isAttributedString ? [text string] : text);
QList<QInputMethodEvent::Attribute> attrs;
attrs<<QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, selectedRange.location + selectedRange.length, 1, QVariant());
QList<QInputMethodEvent::Attribute> preeditAttributes;
preeditAttributes << QInputMethodEvent::Attribute(
QInputMethodEvent::Cursor, selectedRange.location + selectedRange.length, true);
if (isAttributedString) {
int composingLength = preeditString.length();
int index = 0;
// Create attributes for individual sections of preedit text
int index = 0;
int composingLength = preeditString.length();
while (index < composingLength) {
NSRange effectiveRange;
NSRange range = NSMakeRange(index, composingLength-index);
NSRange range = NSMakeRange(index, composingLength - index);
NSDictionary *attributes = [text attributesAtIndex:index
longestEffectiveRange:&effectiveRange
inRange:range];
NSNumber *underlineStyle = [attributes objectForKey:NSUnderlineStyleAttributeName];
if (underlineStyle) {
QColor clr (Qt::black);
NSColor *color = [attributes objectForKey:NSUnderlineColorAttributeName];
if (color) {
clr = qt_mac_toQColor(color);
}
longestEffectiveRange:&effectiveRange inRange:range];
if (NSNumber *underlineStyle = attributes[NSUnderlineStyleAttributeName]) {
QColor underlineColor(Qt::black);
if (NSColor *color = attributes[NSUnderlineColorAttributeName])
underlineColor = qt_mac_toQColor(color);
QTextCharFormat format;
format.setFontUnderline(true);
format.setUnderlineColor(clr);
attrs<<QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat,
effectiveRange.location,
effectiveRange.length,
format);
format.setUnderlineColor(underlineColor);
preeditAttributes << QInputMethodEvent::Attribute(
QInputMethodEvent::TextFormat,
effectiveRange.location, effectiveRange.length,
format);
}
index = effectiveRange.location + effectiveRange.length;
}
} else {
QTextCharFormat format;
format.setFontUnderline(true);
attrs<<QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat,
0, preeditString.length(), format);
preeditAttributes << QInputMethodEvent::Attribute(
QInputMethodEvent::TextFormat, 0, preeditString.length(), format);
}
m_composingText = preeditString;
@ -171,8 +171,8 @@
if (QObject *focusObject = m_platformWindow->window()->focusObject()) {
m_composingFocusObject = focusObject;
if (queryInputMethod(focusObject)) {
QInputMethodEvent e(preeditString, attrs);
QCoreApplication::sendEvent(focusObject, &e);
QInputMethodEvent event(preeditString, preeditAttributes);
QCoreApplication::sendEvent(focusObject, &event);
// prevent handleKeyEvent from sending a key event
m_sendKeyEvent = false;
}